Changeset ea6c838 in mainline for uspace/srv/audio/hound/audio_sink.c
- Timestamp:
- 2012-07-17T08:26:49Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e6bba8f
- Parents:
- 950110ee
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/audio/hound/audio_sink.c
r950110ee rea6c838 46 46 int audio_sink_init(audio_sink_t *sink, const char *name, 47 47 void *private_data, int (*connection_change)(audio_sink_t *, bool), 48 int (*check_format)(audio_sink_t *sink), const audio_format_t *f)48 int (*check_format)(audio_sink_t *sink), const pcm_format_t *f) 49 49 { 50 50 assert(sink); … … 79 79 list_append(&source->link, &sink->sources); 80 80 81 const audio_format_t old_format = sink->format;81 const pcm_format_t old_format = sink->format; 82 82 83 83 /* The first source for me */ 84 84 if (list_count(&sink->sources) == 1) { 85 85 /* Set audio format according to the first source */ 86 if ( audio_format_is_any(&sink->format)) {86 if (pcm_format_is_any(&sink->format)) { 87 87 int ret = audio_sink_set_format(sink, &source->format); 88 88 if (ret != EOK) … … 110 110 } 111 111 112 int audio_sink_set_format(audio_sink_t *sink, const audio_format_t *format)112 int audio_sink_set_format(audio_sink_t *sink, const pcm_format_t *format) 113 113 { 114 114 assert(sink); 115 115 assert(format); 116 if (! audio_format_is_any(&sink->format)) {116 if (!pcm_format_is_any(&sink->format)) { 117 117 log_debug("Sink %s already has a format", sink->name); 118 118 return EEXISTS; 119 119 } 120 const audio_format_t old_format;120 const pcm_format_t old_format; 121 121 122 if ( audio_format_is_any(format)) {122 if (pcm_format_is_any(format)) { 123 123 log_verbose("Setting DEFAULT format for sink %s", sink->name); 124 124 sink->format = AUDIO_FORMAT_DEFAULT;
Note:
See TracChangeset
for help on using the changeset viewer.