Skip to content

M
mpd
Commit 85f7e964 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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.
parent d628eb3e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/main.c
View file @ 85f7e964
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "path.h" #include "path.h"
#include "mapper.h" #include "mapper.h"
#include "pipe.h" #include "pipe.h"
#include "decoder_thread.h"
#include "decoder_control.h" #include "decoder_control.h"
#include "player_control.h" #include "player_control.h"
#include "stats.h" #include "stats.h"
...@@ -261,7 +260,6 @@ int main(int argc, char *argv[]) ...@@ -261,7 +260,6 @@ int main(int argc, char *argv[])
initZeroconf(); initZeroconf();
decoder_thread_start();
player_create(); player_create();
state_file_init(config_get_path(CONF_STATE_FILE)); state_file_init(config_get_path(CONF_STATE_FILE));
......
src/player_thread.c
View file @ 85f7e964
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "player_thread.h" #include "player_thread.h"
#include "player_control.h" #include "player_control.h"
#include "decoder_control.h" #include "decoder_control.h"
#include "decoder_thread.h"
#include "audio.h" #include "audio.h"
#include "pcm_volume.h" #include "pcm_volume.h"
#include "path.h" #include "path.h"
...@@ -507,6 +508,8 @@ static void do_play(void) ...@@ -507,6 +508,8 @@ static void do_play(void)
static gpointer player_task(G_GNUC_UNUSED gpointer arg) static gpointer player_task(G_GNUC_UNUSED gpointer arg)
{ {
decoder_thread_start();
while (1) { while (1) {
switch (pc.command) { switch (pc.command) {
case PLAYER_COMMAND_PLAY: case PLAYER_COMMAND_PLAY:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment