aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Main.cxx4
-rw-r--r--src/Main.hxx2
-rw-r--r--src/PlayerControl.cxx2
-rw-r--r--src/PlayerThread.cxx2
4 files changed, 2 insertions, 8 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index 0124cc38f..bece3720c 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 acc168bc5..7047cced8 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 73230858f..857322c50 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 31a9a2a8a..775e53ef7 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