Changeset f3fced0 in mainline

Timestamp:

2012-07-13T05:39:36Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9b2ac3d

Parents:

63d6ff9

Message:

hound: Implement connect code.

Location:

uspace/srv/audio/hound

Files:

• audio_device.c (modified) (3 diffs)
• audio_sink.c (modified) (4 diffs)
• hound.c (modified) (3 diffs)
• hound.h (modified) (2 diffs)
• main.c (modified) (2 diffs)

uspace/srv/audio/hound/audio_device.c

@@ -100 +100 @@
         audio_device_t *dev = sink->private_data;
         if (list_count(&sink->sources) == 1) {
+                log_verbose("First connection on device sink '%s'", sink->name);
+
                 int ret = get_buffer(dev);
                 if (ret != EOK) {
@@ -106 +108 @@
                         return ret;
                 }
+
                 ret = start_playback(dev);
                 if (ret != EOK) {
@@ -115 +118 @@
         }
         if (list_count(&sink->sources) == 0) {
+                log_verbose("No connections on device sink '%s'", sink->name);
                 int ret = stop_playback(dev);
                 if (ret != EOK) {

uspace/srv/audio/hound/audio_sink.c

@@ -58 +58 @@
         sink->private_data = private_data;
         sink->format = *f;
+        sink->connection_change = connection_change;
         log_verbose("Initialized sink (%p) '%s'", sink, sink->name);
         return EOK;
@@ -90 +91 @@
                                 sink->format = AUDIO_FORMAT_DEFAULT;
                         } else {
-                                log_verbose("Set format base on the first "
-                                    "source(%s): %u channels, %uHz, %s for "
-                                    " sink %s.", source->name,
+                                log_verbose("Set format based on the first "
+                                    "source(%s): %u channel(s), %uHz, %s for "
+                                    "sink %s.", source->name,
                                     source->format.channels,
                                     source->format.sampling_rate,
@@ -103 +104 @@
         }
 
+        audio_source_connected(source, sink);
+
         if (sink->connection_change) {
+                log_verbose("Calling connection change");
                 const int ret = sink->connection_change(sink);
                 if (ret != EOK) {
                         log_debug("Connection hook failed.");
+                        audio_source_connected(source, NULL);
                         list_remove(&source->link);
                         sink->format = old_format;
@@ -112 +117 @@
                 }
         }
+        log_verbose("Connected source '%s' to sink '%s'",
+            source->name, sink->name);
 
         return EOK;

uspace/srv/audio/hound/hound.c

@@ -55 +55 @@
                     audio_ ## type ## _list_instance(it); \
                 if (str_cmp(name, dev->name) == 0) { \
-                        log_debug("%s with name '%s' is already present", \
+                        log_debug("%s with name '%s' is in the list", \
                             #type, name); \
                         return dev; \
@@ -82 +82 @@
         list_initialize(&hound->devices);
         list_initialize(&hound->sources);
-        list_initialize(&hound->available_sources);
         list_initialize(&hound->sinks);
         return EOK;
@@ -202 +201 @@
 }
 
+int hound_connect(hound_t *hound, const char* source_name, const char* sink_name)
+{
+        assert(hound);
+        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);
+        if (!source || !sink) {
+                fibril_mutex_unlock(&hound->list_guard);
+                log_debug("Sink (%p), or source (%p) not found", sink, source);
+                return ENOENT;
+        }
+        list_remove(&source->link);
+        const int ret = audio_sink_add_source(sink, source);
+        if (ret != EOK) {
+                log_debug("Failed add source to sink list: %s", str_error(ret));
+                list_append(&source->link, &hound->sources);
+        }
+        fibril_mutex_unlock(&hound->list_guard);
+        return EOK;
+}
+
+int hound_disconnect(hound_t *hound, const char* source_name, const char* sink_name)
+{
+        return ENOTSUP;
+}
 /**
  * @}

uspace/srv/audio/hound/hound.h

@@ -52 +52 @@
         list_t devices;
         list_t sources;
-        list_t available_sources;
         list_t sinks;
 } hound_t;
@@ -60 +59 @@
 int hound_add_source(hound_t *hound, audio_source_t *source);
 int hound_add_sink(hound_t *hound, audio_sink_t *sink);
-int hound_connect(const char* source_name, const char* sink_name);
-int hound_disconnect(const char* source_name, const char* sink_name);
+int hound_connect(hound_t *hound, const char* source_name, const char* sink_name);
+int hound_disconnect(hound_t *hound, const char* source_name, const char* sink_name);
 
 #endif

uspace/srv/audio/hound/main.c

@@ -145 +145 @@
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-                log_debug("Got method %u", IPC_GET_IMETHOD(call));
                 switch (IPC_GET_IMETHOD(call)) {
                 case HOUND_REGISTER_PLAYBACK: {
@@ -209 +208 @@
                 }
                 case HOUND_CONNECT: {
-                        //TODO Get Name
-                        //TODO Get Name
-                        //TODO connect in hound
+                        const char *name_a = get_name();
+                        const char *name_b = get_name();
+                        const int ret = hound_connect(&hound, name_a, name_b);
+                        if (ret != EOK)
+                                log_error("Failed to connect '%s' to '%s': %s",
+                                    name_a, name_b, str_error(ret));
+                        free(name_a);
+                        free(name_b);
+                        async_answer_0(callid, ret);
                         break;
                 }
                 case HOUND_DISCONNECT: {
-                        //TODO Get Name
-                        //TODO Get Name
-                        //TODO disconnect in hound
+                        const char *name_a = get_name();
+                        const char *name_b = get_name();
+                        const int ret = hound_disconnect(&hound, name_a, name_b);
+                        if (ret != EOK)
+                                log_error("Failed to disconnect '%s' from '%s'"
+                                    ": %s", name_a, name_b, str_error(ret));
+                        free(name_a);
+                        free(name_b);
+                        async_answer_0(callid, ret);
                         break;
                 }
                 default:
+                        log_debug("Got unknown method %u",
+                            IPC_GET_IMETHOD(call));
                         async_answer_0(callid, ENOTSUP);
                         break;
                 case 0:
+                        //TODO remove all clients
                         return;
                 }