oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm_mix: return bool, make unimplemented format non-fatal

Browse Source 
Let the caller deal with a failure.
This commit is contained in:
Max Kellermann
2011-10-20 02:25:40 +02:00
parent d019343017
commit 13ad2b4dc2
3 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/output_thread.c
View File

@@ -401,8 +401,12 @@ ao_filter_chunk(struct audio_output *ao, const struct music_chunk *chunk,
char *dest = pcm_buffer_get(&ao->cross_fade_buffer,
other_length);
memcpy(dest, other_data, other_length);
pcm_mix(dest, data, length, ao->in_audio_format.format,
1.0 - chunk->mix_ratio);
if (!pcm_mix(dest, data, length, ao->in_audio_format.format,
1.0 - chunk->mix_ratio)) {
g_warning("Cannot cross-fade format %s",
sample_format_to_string(ao->in_audio_format.format));
return NULL;
}
data = dest;
length = other_length;