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

Timestamp:

2012-07-12T17:21:08Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

992ef56

Parents:

737b4c0

Message:

hound: Move mixing to audio_source.

File:

• uspace/srv/audio/hound/audio_sink.c (modified) (1 diff)

uspace/srv/audio/hound/audio_sink.c

@@ -150 +150 @@
         list_foreach(sink->sources, it) {
                 audio_source_t *source = audio_source_list_instance(it);
-                assert(audio_format_same(&sink->format, audio_source_format(source)));
-                const void *source_buffer;
-                size_t source_buffer_size = size;
-                int ret = audio_source_get_buffer(source, &source_buffer,
-                    &source_buffer_size);
-                if (ret != EOK) {
-                        log_warning("Could not get buffer from source %s",
-                            source->name);
-                        continue;
-                }
-                assert(source_buffer_size == size);
-                ret = audio_format_mix(dest, source_buffer, size, &sink->format);
+                const int ret =
+                    audio_source_add_self(source, dest, size, &sink->format);
                 if (ret != EOK) {
                         log_warning("Failed to mix source %s: %s",