Skip to content

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

PlayerThread: unlock/lock in player_task()

parent bcb2db62
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
src/PlayerThread.cxx
View file @ d8c5a63b
...@@ -912,8 +912,6 @@ player::SongBorder() ...@@ -912,8 +912,6 @@ player::SongBorder()
inline void inline void
player::Run() player::Run()
{ {
pc.Unlock();
pipe = new MusicPipe(); pipe = new MusicPipe();
StartDecoder(*pipe); StartDecoder(*pipe);
...@@ -923,8 +921,6 @@ player::Run() ...@@ -923,8 +921,6 @@ player::Run()
StopDecoder(); StopDecoder();
player_command_finished(pc); player_command_finished(pc);
delete pipe; delete pipe;
GlobalEvents::Emit(GlobalEvents::PLAYLIST);
pc.Lock();
return; return;
} }
...@@ -1095,10 +1091,6 @@ player::Run() ...@@ -1095,10 +1091,6 @@ player::Run()
pc.state = PLAYER_STATE_STOP; pc.state = PLAYER_STATE_STOP;
pc.Unlock(); pc.Unlock();
GlobalEvents::Emit(GlobalEvents::PLAYLIST);
pc.Lock();
} }
static void static void
...@@ -1127,7 +1119,10 @@ player_task(gpointer arg) ...@@ -1127,7 +1119,10 @@ player_task(gpointer arg)
case PLAYER_COMMAND_QUEUE: case PLAYER_COMMAND_QUEUE:
assert(pc.next_song != NULL); assert(pc.next_song != NULL);
pc.Unlock();
do_play(pc, dc, buffer); do_play(pc, dc, buffer);
GlobalEvents::Emit(GlobalEvents::PLAYLIST);
pc.Lock();
break; break;
case PLAYER_COMMAND_STOP: case PLAYER_COMMAND_STOP:
......
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