Changeset ec81221 in mainline

Timestamp:

2013-03-24T14:09:11Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2ba4d45

Parents:

7294b5b

Message:

libhound: Handle default target

Location:

uspace

Files:

• app/wavplay/main.c (modified) (1 diff)
• lib/hound/include/hound/client.h (modified) (1 diff)
• lib/hound/src/client.c (modified) (2 diffs)

uspace/app/wavplay/main.c

@@ -81 +81 @@
         }
 
-        ret = hound_context_connect_target(hound, "default");
+        ret = hound_context_connect_target(hound, HOUND_DEFAULT_TARGET);
         if (ret != EOK) {
                 printf("Failed to connect to default target: %s\n",

uspace/lib/hound/include/hound/client.h

@@ -41 +41 @@
 #include <pcm/format.h>
 
-#define DEFAULT_SINK "default"
-#define DEFAULT_SOURCE "default"
+#define HOUND_DEFAULT_TARGET "default"
+#define HOUND_ALL_TARGETS "all"
+#define DEFAULT_SINK "default" //DEPRECATED
 
 typedef struct hound_context hound_context_t;

uspace/lib/hound/src/client.c

@@ -160 +160 @@
 {
         assert(hound);
-        if (hound->record)
-                return hound_service_connect_source_sink(
+        assert(target);
+
+        const char **tgt = NULL;
+        size_t count = 1;
+        int ret = EOK;
+        if (str_cmp(target, HOUND_DEFAULT_TARGET) == 0) {
+                ret = hound_context_get_available_targets(hound, &tgt, &count);
+                if (ret != EOK)
+                        return ret;
+                target = tgt[0];
+        }
+        //TODO handle all-targets
+
+        if (hound->record) {
+                ret = hound_service_connect_source_sink(
                     hound->session, target, hound->name);
-        else
-                return hound_service_connect_source_sink(
+        } else {
+                ret = hound_service_connect_source_sink(
                     hound->session, hound->name, target);
+        }
+        if (tgt)
+                free(tgt[0]);
+        free(tgt);
+        return ret;
 }
 
@@ -171 +189 @@
 {
         assert(hound);
-        if (hound->record)
+        assert(target);
+        if (hound->record) {
                 return hound_service_disconnect_source_sink(
                     hound->session, target, hound->name);
-        else
+        } else {
                 return hound_service_disconnect_source_sink(
                     hound->session, hound->name, target);
+        }
 }