output_all: synchronize playback with player_control.notify

This patch fixes a longer delay when moving around songs in the playlist. The main thread wants to enqueue a new "next" song into the player thread, but the player thread is waiting inside audio_output_all_wait() for the output threads. Use player_control.notify there, so audio_output_all_wait() gets woken up by the main thread, too.

output_all: synchronize playback with player_control.notify
207786ff · Max Kellermann · ed483766 · 207786ff · 207786ff
Commit 207786ff authored Mar 26, 2009 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

output_all.c src/output_all.c +2 -1

output_thread.c src/output_thread.c +2 -1

No files found.
--- a/src/output_all.c
+++ b/src/output_all.c
@@ -24,6 +24,7 @@
 #include "conf.h"
 #include "pipe.h"
 #include "buffer.h"
+#include "player_control.h"
 #ifndef NDEBUG
 #include "chunk.h"
@@ -414,7 +415,7 @@ audio_output_all_wait(unsigned threshold)
 	if (audio_output_all_check() < threshold)
 		return true;
-	notify_wait(&audio_output_client_notify);
+	notify_wait(&pc.notify);
 	return audio_output_all_check() < threshold;
 }

--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -22,6 +22,7 @@
 #include "output_internal.h"
 #include "chunk.h"
 #include "pipe.h"
+#include "player_control.h"
 #include <glib.h>
@@ -156,7 +157,7 @@ static void ao_play(struct audio_output *ao)
 	ao->chunk_finished = true;
 	g_mutex_unlock(ao->mutex);
-	notify_signal(&audio_output_client_notify);
+	notify_signal(&pc.notify);
 }
 static void ao_pause(struct audio_output *ao)