From 4ee8396f417d15c161b425c6f8c15fe845242434 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 12 Apr 2008 04:14:45 +0000 Subject: use the notify API in the main thread git-svn-id: https://svn.musicpd.org/mpd/trunk@7283 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/player.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/player.c') diff --git a/src/player.c b/src/player.c index a8bb2404d..07c074060 100644 --- a/src/player.c +++ b/src/player.c @@ -33,9 +33,6 @@ #include "sig_handlers.h" #include "os_compat.h" -static pthread_cond_t main_wakeup = PTHREAD_COND_INITIALIZER; -static pthread_mutex_t main_wakeup_mutex = PTHREAD_MUTEX_INITIALIZER; - static void playerCloseAudio(void); void wakeup_player_nb(void) @@ -48,12 +45,7 @@ static void wakeup_player(void) { PlayerControl *pc = &(getPlayerData()->playerControl); notifySignal(&pc->notify); - pthread_cond_wait(&main_wakeup, &main_wakeup_mutex); -} - -void wakeup_main_task(void) -{ - pthread_cond_signal(&main_wakeup); + wait_main_task(); } void player_sleep(void) -- cgit v1.2.3