From 5399a72ec1141307e79970993e4a90a8d643ac50 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 2 May 2010 15:31:31 +0200 Subject: 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. --- src/output_control.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/output_control.c') 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); } -- cgit v1.2.3