output_all: move _lock_signal() to output_control.c

Better name, better documentation.

1 files changed, 3 insertions, 19 deletions

diff --git a/src/output_all.c b/src/output_all.c
index 551736a41..4e0b2eb22 100644
--- a/src/output_all.c
+++ b/src/output_all.c
@@ -206,29 +206,13 @@ static void audio_output_wait_all(void)
 }
 
 /**
- * Signal the audio output if it is open, and set the "allow_play"
- * flag.  This function locks the mutex.
- */
-static void
-audio_output_lock_signal(struct audio_output *ao)
-{
-	g_mutex_lock(ao->mutex);
-
-	ao->allow_play = true;
-	if (audio_output_is_open(ao))
-		g_cond_signal(ao->cond);
-
-	g_mutex_unlock(ao->mutex);
-}
-
-/**
  * Signals all audio outputs which are open.
  */
 static void
-audio_output_signal_all(void)
+audio_output_allow_play_all(void)
 {
 	for (unsigned i = 0; i < num_audio_outputs; ++i)
-		audio_output_lock_signal(&audio_outputs[i]);
+		audio_output_allow_play(&audio_outputs[i]);
 }
 
 static void
@@ -533,7 +517,7 @@ audio_output_all_cancel(void)
 	/* the audio outputs are now waiting for a signal, to
 	   synchronize the cleared music pipe */
 
-	audio_output_signal_all();
+	audio_output_allow_play_all();
 
 	/* invalidate elapsed_time */