Changeset 1c33539 in mainline

Timestamp:

2012-07-13T07:26:20Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6424800

Parents:

fd5c0b7

Message:

hound: Implement disconnect

Location:

uspace/srv/audio/hound

Files:

• audio_client.c (modified) (1 diff)
• audio_sink.c (modified) (1 diff)
• hound.c (modified) (2 diffs)

uspace/srv/audio/hound/audio_client.c

@@ -132 +132 @@
                 return ENOMEM;
         assert(client->exch);
-        int ret = async_data_read_start(client->exch, buffer, size);
+        const int ret = async_data_read_start(client->exch, buffer, size);
         if (ret != EOK) {
                 log_debug("Failed to read data from client");

uspace/srv/audio/hound/audio_sink.c

@@ -137 +137 @@
                 }
         }
+        audio_source_connected(source, NULL);
         return EOK;
 }

uspace/srv/audio/hound/hound.c

@@ -211 +211 @@
         if (!source || !sink) {
                 fibril_mutex_unlock(&hound->list_guard);
-                log_debug("Sink (%p), or source (%p) not found", sink, source);
+                log_debug("Source (%p), or sink (%p) not found", source, sink);
                 return ENOENT;
         }
@@ -226 +226 @@
 int hound_disconnect(hound_t *hound, const char* source_name, const char* sink_name)
 {
+        assert(hound);
+        log_verbose("Disconnecting '%s' to '%s'.", source_name, sink_name);
+        fibril_mutex_lock(&hound->list_guard);
+        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;
+        if (!source || !sink) {
+                fibril_mutex_unlock(&hound->list_guard);
+                log_debug("Source (%p), or sink (%p) not found", source, sink);
+                return ENOENT;
+        }
+        const int ret = audio_sink_remove_source(sink, source);
+        if (ret != EOK) {
+                log_debug("Failed remove source to sink list: %s", str_error(ret));
+        } else {
+                list_append(&source->link, &hound->sources);
+        }
+        fibril_mutex_unlock(&hound->list_guard);
+        return EOK;
         return ENOTSUP;
 }