diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-10 09:58:18 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-10 10:01:24 +0100 |
| commit | 18076ac9b766485efc45931e62a164e5cc1a8542 (patch) | |
| tree | 111b228b929dff89978807e638afcba3897210b2 /src | |
| parent | ad15ca7104ca299c87b6ac86441573a00c589fef (diff) | |
PlayerThread: use pc.cond instead of main_cond
The main_cond variable was completely unnecessary. The pc.cond object
can be used for both main->pc and pc->main.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Main.cxx | 4 | ||||
| -rw-r--r-- | src/Main.hxx | 2 | ||||
| -rw-r--r-- | src/PlayerControl.cxx | 2 | ||||
| -rw-r--r-- | src/PlayerThread.cxx | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index 0124cc38..bece3720 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -98,8 +98,6 @@ enum { GThread *main_task; GMainLoop *main_loop; -GCond *main_cond; - Partition *global_partition; static bool @@ -404,7 +402,6 @@ int mpd_main(int argc, char *argv[]) main_task = g_thread_self(); main_loop = g_main_loop_new(NULL, FALSE); - main_cond = g_cond_new(); GlobalEvents::Initialize(); GlobalEvents::Register(GlobalEvents::IDLE, idle_event_emitted); @@ -536,7 +533,6 @@ int mpd_main(int argc, char *argv[]) sticker_global_finish(); #endif - g_cond_free(main_cond); GlobalEvents::Deinitialize(); playlist_list_global_finish(); diff --git a/src/Main.hxx b/src/Main.hxx index acc168bc..7047cced 100644 --- a/src/Main.hxx +++ b/src/Main.hxx @@ -26,8 +26,6 @@ extern GThread *main_task; extern GMainLoop *main_loop; -extern GCond *main_cond; - extern struct Partition *global_partition; /** diff --git a/src/PlayerControl.cxx b/src/PlayerControl.cxx index 73230858..857322c5 100644 --- a/src/PlayerControl.cxx +++ b/src/PlayerControl.cxx @@ -76,7 +76,7 @@ static void player_command_wait_locked(struct player_control *pc) { while (pc->command != PLAYER_COMMAND_NONE) - g_cond_wait(main_cond, pc->mutex); + g_cond_wait(pc->cond, pc->mutex); } static void diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx index 31a9a2a8..775e53ef 100644 --- a/src/PlayerThread.cxx +++ b/src/PlayerThread.cxx @@ -147,7 +147,7 @@ player_command_finished_locked(struct player_control *pc) assert(pc->command != PLAYER_COMMAND_NONE); pc->command = PLAYER_COMMAND_NONE; - g_cond_signal(main_cond); + g_cond_signal(pc->cond); } static void |