diff options
author | Max Kellermann <max@duempel.org> | 2009-01-25 13:44:39 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-01-25 13:44:39 +0100 |
commit | 85f7e964dee606ecd6ceb2da7ce0e85d90c3f5ce (patch) | |
tree | b14fd34b5924c6fbfa6f59d6b0c63084ff9449c2 | |
parent | d628eb3e8bb2b7e9db5ef6f5b907ac2a81afc86a (diff) | |
download | mpd-85f7e964dee606ecd6ceb2da7ce0e85d90c3f5ce.tar.gz mpd-85f7e964dee606ecd6ceb2da7ce0e85d90c3f5ce.tar.xz mpd-85f7e964dee606ecd6ceb2da7ce0e85d90c3f5ce.zip |
player_thread: start decoder thread in player thread
Start the decoder thread when the player thread starts. The decoder
thread is already stopped by the player thread.
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | src/player_thread.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index fa2bc3ac6..550453dfe 100644 --- a/src/main.c +++ b/src/main.c @@ -31,7 +31,6 @@ #include "path.h" #include "mapper.h" #include "pipe.h" -#include "decoder_thread.h" #include "decoder_control.h" #include "player_control.h" #include "stats.h" @@ -261,7 +260,6 @@ int main(int argc, char *argv[]) initZeroconf(); - decoder_thread_start(); player_create(); state_file_init(config_get_path(CONF_STATE_FILE)); diff --git a/src/player_thread.c b/src/player_thread.c index c8f4f69f1..d150c4303 100644 --- a/src/player_thread.c +++ b/src/player_thread.c @@ -19,6 +19,7 @@ #include "player_thread.h" #include "player_control.h" #include "decoder_control.h" +#include "decoder_thread.h" #include "audio.h" #include "pcm_volume.h" #include "path.h" @@ -507,6 +508,8 @@ static void do_play(void) static gpointer player_task(G_GNUC_UNUSED gpointer arg) { + decoder_thread_start(); + while (1) { switch (pc.command) { case PLAYER_COMMAND_PLAY: |