Changeset fa60cd69 in mainline for uspace/srv/audio/hound/hound.c

Timestamp:

2013-04-02T19:06:27Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

35ab943

Parents:

39c4d1f

Message:

hound: add connection class

This will enable N to M routing in the future

File:

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

uspace/srv/audio/hound/hound.c

@@ -43 +43 @@
 #include "audio_sink.h"
 #include "audio_source.h"
+#include "connection.h"
 #include "log.h"
 #include "errno.h"
@@ -86 +87 @@
         list_initialize(&hound->sources);
         list_initialize(&hound->sinks);
+        list_initialize(&hound->connections);
         return EOK;
 }
@@ -207 +209 @@
                 return EEXISTS;
         }
-        list_foreach(hound->sinks, it) {
-                audio_sink_t *sink = audio_sink_list_instance(it);
-                if (find_source_by_name(&sink->sources, source->name)) {
-                        log_debug("Source by that name already exists");
-                        fibril_mutex_unlock(&hound->list_guard);
-                        return EEXISTS;
-                }
-        }
         list_append(&source->link, &hound->sources);
         fibril_mutex_unlock(&hound->list_guard);
@@ -245 +239 @@
         log_verbose("Removing source '%s'.", source->name);
         fibril_mutex_lock(&hound->list_guard);
-        if (!list_member(&source->link, &hound->sources)) {
-                assert(source->connected_sink);
-                hound_disconnect_internal(hound, source->name,
-                    source->connected_sink->name);
-        }
+
         list_remove(&source->link);
         fibril_mutex_unlock(&hound->list_guard);
@@ -263 +253 @@
         fibril_mutex_lock(&hound->list_guard);
 
-        if (!list_empty(&sink->sources)) {
+        if (!list_empty(&sink->connections)) {
                 // TODO disconnect instead
                 fibril_mutex_unlock(&hound->list_guard);
@@ -278 +268 @@
         log_verbose("Connecting '%s' to '%s'.", source_name, sink_name);
         fibril_mutex_lock(&hound->list_guard);
+
+        if (list_empty(&hound->sinks)) {
+                fibril_mutex_unlock(&hound->list_guard);
+                log_debug("No sinks available");
+                return EINVAL;
+        }
+
+        if (list_empty(&hound->sources)) {
+                fibril_mutex_unlock(&hound->list_guard);
+                log_debug("No sinks available");
+                return EINVAL;
+        }
 
         audio_source_t *source =
@@ -294 +296 @@
                 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);
+        connection_t *conn = connection_create(source, sink);
+        if (!conn) {
+                fibril_mutex_unlock(&hound->list_guard);
+                log_debug("Failed to create connection");
+                return ENOMEM;
+        }
+        list_append(&conn->hound_link, &hound->connections);
+        fibril_mutex_unlock(&hound->list_guard);
+        log_debug("CONNECTED: %s -> %s", source_name, sink_name);
         return EOK;
 }
@@ -317 +321 @@
         assert(hound);
         assert(fibril_mutex_is_locked(&hound->list_guard));
-        log_verbose("Disconnecting '%s' to '%s'.", source_name, sink_name);
-
-        audio_sink_t *sink =
-            audio_sink_list_instance(list_first(&hound->sinks));
-        if (str_cmp(sink_name, "default") != 0)
-            sink = find_sink_by_name(&hound->sinks, sink_name);
-
-        audio_source_t *source =
-            audio_source_list_instance(list_first(&hound->sources));
-        if (str_cmp(source_name, "default") != 0)
-            source = sink ? find_source_by_name(&sink->sources, source_name) : NULL;
-        if (!source || !sink) {
-                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);
-        }
+        log_debug("Disconnecting '%s' to '%s'.", source_name, sink_name);
+
+        list_foreach_safe(hound->connections, it, next) {
+                connection_t *conn = connection_from_hound_list(it);
+                if (str_cmp(connection_source_name(conn), source_name) == 0 ||
+                    str_cmp(connection_sink_name(conn), sink_name) == 0) {
+                    log_debug("Removing %s -> %s", connection_source_name(conn),
+                        connection_sink_name(conn));
+                    list_remove(it);
+                    connection_destroy(conn);
+                }
+        }
+
         return EOK;
 }