Changeset 13df13c8 in mainline for uspace/srv/audio/hound/hound.c

Timestamp:

2012-07-13T19:48:19Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

43c40a3

Parents:

ab07cf0

Message:

hound: Fix sink hook ambiguity by adding a parameter.

Also disconnect source when removing instead of failure.

File:

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

uspace/srv/audio/hound/hound.c

@@ -75 +75 @@
         FIND_BY_NAME(sink);
 }
+static int hound_disconnect_internal(hound_t *hound, const char* source_name, const char* sink_name);
 
 int hound_init(hound_t *hound)
@@ -209 +210 @@
         fibril_mutex_lock(&hound->list_guard);
         if (!list_member(&source->link, &hound->sources)) {
-                fibril_mutex_unlock(&hound->list_guard);
-                return EBUSY;
+                assert(source->connected_sink);
+                hound_disconnect_internal(hound, source->name,
+                    source->connected_sink->name);
         }
         list_remove(&source->link);
@@ -224 +226 @@
         log_verbose("Removing sink '%s'.", sink->name);
         fibril_mutex_lock(&hound->list_guard);
+
         if (!list_empty(&sink->sources)) {
+                // TODO disconnect instead
                 fibril_mutex_unlock(&hound->list_guard);
                 return EBUSY;
@@ -259 +263 @@
 {
         assert(hound);
+        fibril_mutex_lock(&hound->list_guard);
+        const int ret = hound_disconnect_internal(hound, source_name, sink_name);
+        fibril_mutex_unlock(&hound->list_guard);
+        return ret;
+}
+
+static int hound_disconnect_internal(hound_t *hound, const char* source_name, const char* sink_name)
+{
+        assert(hound);
+        assert(fibril_mutex_is_locked(&hound->list_guard));
         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;
@@ -274 +286 @@
                 list_append(&source->link, &hound->sources);
         }
-        fibril_mutex_unlock(&hound->list_guard);
-        return EOK;
-        return ENOTSUP;
+        return EOK;
 }
 /**