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.

1 files changed, 6 insertions, 0 deletions

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 <glib.h>
 
@@ -135,6 +136,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.
 	 */