diff options
| author | Max Kellermann <max@duempel.org> | 2009-03-06 00:42:03 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-03-06 00:42:03 +0100 |
| commit | 01cf7feac7bef8b28605b98ef1e7438a995fc554 (patch) | |
| tree | e1c4b7f5d0550d60d7fda8b4909353a47490fa4e /src/main.c | |
| parent | 000b2d4f3a9c4f761ab918aaff4705621bb8559f (diff) | |
| download | mpd-01cf7feac7bef8b28605b98ef1e7438a995fc554.tar.gz mpd-01cf7feac7bef8b28605b98ef1e7438a995fc554.tar.xz mpd-01cf7feac7bef8b28605b98ef1e7438a995fc554.zip | |
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/main.c')
| -rw-r--r-- | src/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index 39c6a3550..a3f613d0e 100644 --- a/src/main.c +++ b/src/main.c @@ -31,7 +31,6 @@ #include "conf.h" #include "path.h" #include "mapper.h" -#include "pipe.h" #include "chunk.h" #include "decoder_control.h" #include "player_control.h" @@ -179,8 +178,7 @@ initialize_decoder_and_player(void) if (buffered_before_play > buffered_chunks) buffered_before_play = buffered_chunks; - pc_init(buffered_before_play); - music_pipe_init(buffered_chunks, &pc.notify); + pc_init(buffered_chunks, buffered_before_play); dc_init(); } @@ -333,7 +331,6 @@ int main(int argc, char *argv[]) #ifdef ENABLE_ARCHIVE archive_plugin_deinit_all(); #endif - music_pipe_free(); config_global_finish(); tag_pool_deinit(); songvec_deinit(); |