Changeset 6906f61 in mainline

Timestamp:

2012-07-13T21:31:42Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

88a37b5

Parents:

43c40a3

Message:

hound: Add support for "default" keyword

File:

• uspace/srv/audio/hound/hound.c (modified) (4 diffs)

uspace/srv/audio/hound/hound.c

@@ -161 +161 @@
 {
         assert(hound);
-        if (!source || !source->name) {
+        if (!source || !source->name || str_cmp(source->name, "default") == 0) {
                 log_debug("Invalid source specified.");
                 return EINVAL;
@@ -187 +187 @@
 {
         assert(hound);
-        if (!sink || !sink->name) {
+        if (!sink || !sink->name || str_cmp(sink->name, "default") == 0) {
                 log_debug("Invalid source specified.");
                 return EINVAL;
@@ -242 +242 @@
         log_verbose("Connecting '%s' to '%s'.", source_name, sink_name);
         fibril_mutex_lock(&hound->list_guard);
+
         audio_source_t *source =
-            find_source_by_name(&hound->sources, source_name);
-        audio_sink_t *sink = find_sink_by_name(&hound->sinks, sink_name);
+            audio_source_list_instance(list_first(&hound->sources));
+        if (str_cmp(source_name, "default") != 0)
+            source = find_source_by_name(&hound->sources, source_name);
+
+        audio_sink_t *sink =
+            audio_sink_list_instance(list_first(&hound->sinks));
+        if (str_cmp(sink_name, "default") != 0)
+            sink = find_sink_by_name(&hound->sinks, sink_name);
+
         if (!source || !sink) {
                 fibril_mutex_unlock(&hound->list_guard);
@@ -274 +282 @@
         assert(fibril_mutex_is_locked(&hound->list_guard));
         log_verbose("Disconnecting '%s' to '%s'.", source_name, sink_name);
-        audio_sink_t *sink = find_sink_by_name(&hound->sinks, sink_name);
-        audio_source_t *source = sink ?  find_source_by_name(&sink->sources, source_name) : NULL;
+
+        audio_sink_t *sink =
+            audio_sink_list_instance(list_first(&hound->sinks));
+        if (str_cmp(sink_name, "default") != 0)
+            sink = find_sink_by_name(&hound->sinks, sink_name);
+
+        audio_source_t *source =
+            audio_source_list_instance(list_first(&hound->sources));
+        if (str_cmp(source_name, "default") != 0)
+            source = sink ? find_source_by_name(&sink->sources, source_name) : NULL;
         if (!source || !sink) {
                 log_debug("Source (%p), or sink (%p) not found", source, sink);