aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_internal.h
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_internal.h
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_internal.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/output_internal.h b/src/output_internal.h
index 06df9531b..06e209374 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.
*/