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_internal.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/output_internal.h') diff --git a/src/output_internal.h b/src/output_internal.h index 06df9531..06e20937 100644 --- a/src/output_internal.h +++ b/src/output_internal.h @@ -21,6 +21,7 @@ #define MPD_OUTPUT_INTERNAL_H #include "audio_format.h" +#include "pcm_buffer.h" #include @@ -134,6 +135,11 @@ struct audio_output { */ struct audio_format out_audio_format; + /** + * The buffer used to allocate the cross-fading result. + */ + struct pcm_buffer cross_fade_buffer; + /** * The filter object of this audio output. This is an * instance of chain_filter_plugin. -- cgit v1.2.3