Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2012-07-12T17:21:08Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial
Children:
992ef56
Parents:
737b4c0
Message:

hound: Move mixing to audio_source.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/audio/hound/audio_sink.c

    r737b4c0 rec49085  
    150150        list_foreach(sink->sources, it) {
    151151                audio_source_t *source = audio_source_list_instance(it);
    152                 assert(audio_format_same(&sink->format, audio_source_format(source)));
    153                 const void *source_buffer;
    154                 size_t source_buffer_size = size;
    155                 int ret = audio_source_get_buffer(source, &source_buffer,
    156                     &source_buffer_size);
    157                 if (ret != EOK) {
    158                         log_warning("Could not get buffer from source %s",
    159                             source->name);
    160                         continue;
    161                 }
    162                 assert(source_buffer_size == size);
    163                 ret = audio_format_mix(dest, source_buffer, size, &sink->format);
     152                const int ret =
     153                    audio_source_add_self(source, dest, size, &sink->format);
    164154                if (ret != EOK) {
    165155                        log_warning("Failed to mix source %s: %s",
Note: See TracChangeset for help on using the changeset viewer.