Changeset f3fced0 in mainline for uspace/srv/audio/hound/audio_sink.c

Timestamp:

2012-07-13T05:39:36Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9b2ac3d

Parents:

63d6ff9

Message:

hound: Implement connect code.

File:

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

uspace/srv/audio/hound/audio_sink.c

@@ -58 +58 @@
         sink->private_data = private_data;
         sink->format = *f;
+        sink->connection_change = connection_change;
         log_verbose("Initialized sink (%p) '%s'", sink, sink->name);
         return EOK;
@@ -90 +91 @@
                                 sink->format = AUDIO_FORMAT_DEFAULT;
                         } else {
-                                log_verbose("Set format base on the first "
-                                    "source(%s): %u channels, %uHz, %s for "
-                                    " sink %s.", source->name,
+                                log_verbose("Set format based on the first "
+                                    "source(%s): %u channel(s), %uHz, %s for "
+                                    "sink %s.", source->name,
                                     source->format.channels,
                                     source->format.sampling_rate,
@@ -103 +104 @@
         }
 
+        audio_source_connected(source, sink);
+
         if (sink->connection_change) {
+                log_verbose("Calling connection change");
                 const int ret = sink->connection_change(sink);
                 if (ret != EOK) {
                         log_debug("Connection hook failed.");
+                        audio_source_connected(source, NULL);
                         list_remove(&source->link);
                         sink->format = old_format;
@@ -112 +117 @@
                 }
         }
+        log_verbose("Connected source '%s' to sink '%s'",
+            source->name, sink->name);
 
         return EOK;