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

Timestamp:

2013-04-02T19:06:27Z (13 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_device.c (modified) (7 diffs)

uspace/srv/audio/hound/audio_device.c

@@ -49 +49 @@
 
 static int device_sink_connection_callback(audio_sink_t *sink, bool new);
-static int device_source_connection_callback(audio_source_t *source);
+static int device_source_connection_callback(audio_source_t *source, bool new);
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 static int device_check_format(audio_sink_t* sink);
@@ -94 +94 @@
         assert(sink);
         audio_device_t *dev = sink->private_data;
-        if (new && list_count(&sink->sources) == 1) {
+        if (new && list_count(&sink->connections) == 1) {
                 log_verbose("First connection on device sink '%s'", sink->name);
 
@@ -104 +104 @@
                 }
                 audio_pcm_register_event_callback(dev->sess,
-                    device_event_callback, dev);
+                    device_event_callback, dev);\
+                // TODO set formats
 
                 /* Fill the buffer first */
@@ -110 +111 @@
                     dev->buffer.base, dev->buffer.size);
 
+                log_verbose("Mixed inputs: %zu/(%u * %u)",
+                    dev->buffer.size, BUFFER_PARTS, pcm_format_frame_size(&dev->sink.format));
                 const unsigned frames = dev->buffer.size /
                     (BUFFER_PARTS * pcm_format_frame_size(&dev->sink.format));
+                log_verbose("FRAME COUNT %u", frames);
                 ret = audio_pcm_start_playback_fragment(dev->sess, frames,
                     dev->sink.format.channels, dev->sink.format.sampling_rate,
@@ -122 +126 @@
                 }
         }
-        if (list_count(&sink->sources) == 0) {
+        if (list_count(&sink->connections) == 0) {
                 assert(!new);
                 log_verbose("No connections on device sink '%s'", sink->name);
@@ -142 +146 @@
 }
 
-static int device_source_connection_callback(audio_source_t *source)
+static int device_source_connection_callback(audio_source_t *source, bool new)
 {
         assert(source);
         audio_device_t *dev = source->private_data;
-        if (source->connected_sink) {
+        if (new && list_count(&source->connections)) {
                 int ret = get_buffer(dev);
                 if (ret != EOK) {
@@ -164 +168 @@
                         return ret;
                 }
-        } else { /* Disconnected */
+        }
+        if (list_count(&source->connections) == 0) { /* Disconnected */
+                assert(!new);
                 int ret = audio_pcm_stop_capture(dev->sess);
                 if (ret != EOK) {