Changeset 7294b5b in mainline

Timestamp:

2013-03-24T13:04:04Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ec81221

Parents:

13318d1

Message:

libhound: Add client wrappers for connection control

Location:

uspace/lib/hound

Files:

• include/hound/client.h (modified) (1 diff)
• src/client.c (modified) (4 diffs)

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

@@ -58 +58 @@
 int hound_context_set_main_stream_format(hound_context_t *hound,
     unsigned channels, unsigned rate, pcm_sample_format_t format);
-int hound_get_output_targets(const char **names, size_t *count);
-int hound_get_input_targets(const char **names, size_t *count);
+
+int hound_context_get_available_targets(hound_context_t *hound,
+    const char ***names, size_t *count);
+int hound_context_get_connected_targets(hound_context_t *hound,
+    const char ***names, size_t *count);
 
 int hound_context_connect_target(hound_context_t *hound, const char* target);

uspace/lib/hound/src/client.c

@@ -95 +95 @@
                 new_context->id = hound_service_register_context(
                     new_context->session, new_context->name, record);
-                if (new_context->id <= 0) {
+                if (hound_context_id_err(new_context->id) != EOK) {
                         free(new_context->name);
                         free(new_context);
@@ -136 +136 @@
 }
 
-int hound_get_output_targets(const char **names, size_t *count)
-{
+int hound_context_get_available_targets(hound_context_t *hound,
+    const char ***names, size_t *count)
+{
+        assert(hound);
         assert(names);
         assert(count);
-        return ENOTSUP;
-}
-
-int hound_get_input_targets(const char **names, size_t *count)
-{
+        return hound_service_get_list_all(hound->session, names, count,
+            hound->record ? HOUND_SOURCE_DEVS : HOUND_SINK_DEVS);
+}
+
+int hound_context_get_connected_targets(hound_context_t *hound,
+    const char ***names, size_t *count)
+{
+        assert(hound);
         assert(names);
         assert(count);
-        return ENOTSUP;
+        return hound_service_get_list(hound->session, names, count,
+            HOUND_CONNECTED | (hound->record ?
+                HOUND_SOURCE_DEVS : HOUND_SINK_DEVS), hound->name);
 }
 
@@ -153 +160 @@
 {
         assert(hound);
-        return ENOTSUP;
+        if (hound->record)
+                return hound_service_connect_source_sink(
+                    hound->session, target, hound->name);
+        else
+                return hound_service_connect_source_sink(
+                    hound->session, hound->name, target);
 }
 
@@ -159 +171 @@
 {
         assert(hound);
-        return ENOTSUP;
+        if (hound->record)
+                return hound_service_disconnect_source_sink(
+                    hound->session, target, hound->name);
+        else
+                return hound_service_disconnect_source_sink(
+                    hound->session, hound->name, target);
 }