aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-05-02 15:31:31 +0200
committerMax Kellermann <max@duempel.org>2010-05-02 17:46:07 +0200
commit5399a72ec1141307e79970993e4a90a8d643ac50 (patch)
tree87f3ecbbb6c4875f2754dd72b0a577a7b81d652d /src/output_control.c
parentd093fb2441ee99722670f0401215031fc324bb31 (diff)
downloadmpd-5399a72ec1141307e79970993e4a90a8d643ac50.tar.gz
mpd-5399a72ec1141307e79970993e4a90a8d643ac50.tar.xz
mpd-5399a72ec1141307e79970993e4a90a8d643ac50.zip
player_thread: move cross-fading to output thread
Remove cross_fade_apply(), and call pcm_mix() in the output thread, mixing the chunk and chunk->other together.
Diffstat (limited to '')
-rw-r--r--src/output_control.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/output_control.c b/src/output_control.c
index 17edc3d72..bcedae247 100644
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -301,4 +301,6 @@ void audio_output_finish(struct audio_output *ao)
g_mutex_free(ao->mutex);
filter_free(ao->filter);
+
+ pcm_buffer_deinit(&ao->cross_fade_buffer);
}