aboutsummaryrefslogtreecommitdiff
path: root/src/decoder_control.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-03-06 00:42:03 +0100
committerMax Kellermann <max@duempel.org>2009-03-06 00:42:03 +0100
commit01cf7feac7bef8b28605b98ef1e7438a995fc554 (patch)
treee1c4b7f5d0550d60d7fda8b4909353a47490fa4e /src/decoder_control.h
parent000b2d4f3a9c4f761ab918aaff4705621bb8559f (diff)
pipe: added music_buffer, rewrite music_pipe
Turn the music_pipe into a simple music_chunk queue. The music_chunk allocation code is moved to music_buffer, and is now managed with a linked list instead of a ring buffer. Two separate music_pipe objects are used by the decoder for the "current" and the "next" song, which greatly simplifies the cross-fading code.
Diffstat (limited to 'src/decoder_control.h')
-rw-r--r--src/decoder_control.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/decoder_control.h b/src/decoder_control.h
index d1d0625e..f981074d 100644
--- a/src/decoder_control.h
+++ b/src/decoder_control.h
@@ -66,6 +66,12 @@ struct decoder_control {
struct song *current_song;
struct song *next_song;
float total_time;
+
+ /** the #music_chunk allocator */
+ struct music_buffer *buffer;
+
+ /** the destination pipe for decoded chunks */
+ struct music_pipe *pipe;
};
extern struct decoder_control dc;