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

Timestamp:

2012-07-17T06:53:55Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

950110ee

Parents:

bb67def

Message:

hound: Check format before starting playback.

File:

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

uspace/srv/audio/hound/audio_device.c

@@ -51 +51 @@
 static int device_source_connection_callback(audio_source_t *source);
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static int device_check_format(audio_sink_t* sink);
 static int get_buffer(audio_device_t *dev);
 static int release_buffer(audio_device_t *dev);
@@ -68 +69 @@
 
         audio_sink_init(&dev->sink, name, dev, device_sink_connection_callback,
-            &AUDIO_FORMAT_ANY);
+            device_check_format, &AUDIO_FORMAT_ANY);
         audio_source_init(&dev->source, name, dev,
             device_source_connection_callback, NULL, &AUDIO_FORMAT_ANY);
@@ -222 +223 @@
         }
 }
+static int device_check_format(audio_sink_t* sink)
+{
+        assert(sink);
+        audio_device_t *dev = sink->private_data;
+        assert(dev);
+        log_verbose("Checking format on sink %s", sink->name);
+        return audio_pcm_test_format(dev->sess, &sink->format.channels,
+            &sink->format.sampling_rate, &sink->format.sample_format);
+}
 
 static int get_buffer(audio_device_t *dev)