Changeset fa60cd69 in mainline for uspace/srv/audio/hound/audio_sink.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/audio_sink.c (modified) (11 diffs)

uspace/srv/audio/hound/audio_sink.c

@@ -41 +41 @@
 
 #include "audio_sink.h"
+#include "connection.h"
 #include "log.h"
 
@@ -54 +55 @@
         }
         link_initialize(&sink->link);
-        list_initialize(&sink->sources);
+        list_initialize(&sink->connections);
         sink->name = str_dup(name);
         sink->private_data = private_data;
@@ -67 +68 @@
 {
         assert(sink);
+        assert(list_empty(&sink->connections));
         assert(!sink->private_data);
         free(sink->name);
@@ -72 +74 @@
 }
 
+#if 0
 int audio_sink_add_source(audio_sink_t *sink, audio_source_t *source)
 {
@@ -92 +95 @@
 
         audio_source_connected(source, sink);
-
         if (sink->connection_change) {
                 log_verbose("Calling connection change");
@@ -98 +100 @@
                 if (ret != EOK) {
                         log_debug("Connection hook failed.");
-                        audio_source_connected(source, NULL);
-                        list_remove(&source->link);
-                        sink->format = old_format;
+        //              audio_source_connected(source, NULL);
+        //              list_remove(&source->link);
+//                      sink->format = old_format;
                         return ret;
                 }
@@ -109 +111 @@
         return EOK;
 }
+#endif
 
 int audio_sink_set_format(audio_sink_t *sink, const pcm_format_t *format)
@@ -118 +121 @@
                 return EEXISTS;
         }
-        const pcm_format_t old_format;
+        const pcm_format_t old_format = sink->format;
 
         if (pcm_format_is_any(format)) {
@@ -140 +143 @@
 }
 
+#if 0
 int audio_sink_remove_source(audio_sink_t *sink, audio_source_t *source)
 {
@@ -157 +161 @@
         return EOK;
 }
+#endif
 
 
@@ -165 +170 @@
 
         pcm_format_silence(dest, size, &sink->format);
-        list_foreach(sink->sources, it) {
-                audio_source_t *source = audio_source_list_instance(it);
-                const int ret =
-                    audio_source_add_self(source, dest, size, &sink->format);
+        list_foreach(sink->connections, it) {
+                connection_t * conn = connection_from_sink_list(it);
+                const int ret = connection_add_source_data(
+                    conn, dest, size, sink->format);
                 if (ret != EOK) {
-                        log_warning("Failed to mix source %s: %s",
-                            source->name, str_error(ret));
+                        log_warning("Failed to add source %s: %s",
+                            connection_source_name(conn), str_error(ret));
                 }
         }