player_control: protect command, state, error with a mutex

Use GMutex/GCond instead of the notify library.  Manually lock the
player_control object before accessing the protected attributes.  Use
the GCond object to notify the player thread and the main thread.

2 files changed, 8 insertions, 3 deletions

diff --git a/src/output_all.c b/src/output_all.c
index 08f4ee0dc..bdf0385bb 100644
--- a/src/output_all.c
+++ b/src/output_all.c
@@ -445,10 +445,15 @@ audio_output_all_check(void)
 bool
 audio_output_all_wait(unsigned threshold)
 {
-	if (audio_output_all_check() < threshold)
+	player_lock();
+
+	if (audio_output_all_check() < threshold) {
+		player_unlock();
 		return true;
+	}
 
-	notify_wait(&pc.notify);
+	player_wait();
+	player_unlock();
 
 	return audio_output_all_check() < threshold;
 }
diff --git a/src/output_thread.c b/src/output_thread.c
index 24a22f6df..ef8fe7418 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -359,7 +359,7 @@ ao_play(struct audio_output *ao)
 	ao->chunk_finished = true;
 
 	g_mutex_unlock(ao->mutex);
-	notify_signal(&pc.notify);
+	player_lock_signal();
 	g_mutex_lock(ao->mutex);
 
 	return true;