aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder_control.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-02 16:55:43 +0100
committerMax Kellermann <max@duempel.org>2008-11-02 16:55:43 +0100
commit8b1f6ff3c8ed06ef469d29b4a691dc4776a3db82 (patch)
tree1f54932ea014cf5ef97b2c298e2051bbd4fbb22e /src/decoder_control.h
parent30fca5e5a9c26bf73a24ae5710f8d9d21be49011 (diff)
downloadmpd-8b1f6ff3c8ed06ef469d29b4a691dc4776a3db82.tar.gz
mpd-8b1f6ff3c8ed06ef469d29b4a691dc4776a3db82.tar.xz
mpd-8b1f6ff3c8ed06ef469d29b4a691dc4776a3db82.zip
decoder: replaced music_pipe.audioFormat with dc.out_audio_format
.. and rename dc.audioFormat to dc.in_audio_format. The music pipe does not need to know the audio format, and its former "audioFormat" property indicated the format of the most recently added chunk, which might be confusing when you are reading the oldest chunks.
Diffstat (limited to '')
-rw-r--r--src/decoder_control.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/decoder_control.h b/src/decoder_control.h
index bfee8a259..5f7bbf546 100644
--- a/src/decoder_control.h
+++ b/src/decoder_control.h
@@ -47,7 +47,13 @@ struct decoder_control {
bool seekError;
bool seekable;
volatile double seekWhere;
- struct audio_format audioFormat;
+
+ /** the format of the song file */
+ struct audio_format in_audio_format;
+
+ /** the format being sent to the music pipe */
+ struct audio_format out_audio_format;
+
struct song *current_song;
struct song *volatile next_song;
volatile float totalTime;