summaryrefslogtreecommitdiff
path: root/src/decoder_internal.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_internal.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_internal.h')
-rw-r--r--src/decoder_internal.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/decoder_internal.h b/src/decoder_internal.h
index ab52ab037..cf46eb2c9 100644
--- a/src/decoder_internal.h
+++ b/src/decoder_internal.h
@@ -42,17 +42,16 @@ struct decoder {
/**
* Returns the current chunk the decoder writes to, or allocates a new
* chunk if there is none.
+ *
+ * @return the chunk, or NULL if we have received a decoder command
*/
struct music_chunk *
-decoder_get_chunk(struct decoder *decoder);
+decoder_get_chunk(struct decoder *decoder, struct input_stream *is);
/**
- * Flushes a chunk. Waits for room in the music pipe if required.
- *
- * @return DECODE_COMMAND_NONE on success, any other command if we
- * have received a decoder command while waiting
+ * Flushes the current chunk.
*/
-enum decoder_command
-decoder_flush_chunk(struct decoder *decoder, struct input_stream *is);
+void
+decoder_flush_chunk(struct decoder *decoder);
#endif