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_init.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/output_init.c') diff --git a/src/output_init.c b/src/output_init.c index 6ee340edc..a091e749a 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -191,6 +191,8 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, ao->pause = false; ao->fail_timer = NULL; + pcm_buffer_init(&ao->cross_fade_buffer); + /* set up the filter chain */ ao->filter = filter_chain_new(); -- cgit v1.2.3