diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-01 19:19:42 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-01 19:19:42 +0200 |
| commit | 6a3008d7ff787164124a43911145f7305c66aa7e (patch) | |
| tree | 54090ac05037c9ba4c7536747462469744bb2531 /src/output_all.c | |
| parent | 140162191388063e41e33b53d4533e07529df870 (diff) | |
| parent | 2556449b361c00d9c66cf85beb64d7c6458763ed (diff) | |
| download | mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.gz mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.xz mpd-6a3008d7ff787164124a43911145f7305c66aa7e.zip | |
Merge branch 'v0.16.x'
Conflicts:
configure.ac
src/output_control.c
Diffstat (limited to 'src/output_all.c')
| -rw-r--r-- | src/output_all.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/output_all.c b/src/output_all.c index bd7c48c92..7f4694a8b 100644 --- a/src/output_all.c +++ b/src/output_all.c @@ -207,26 +207,13 @@ static void audio_output_wait_all(void) } /** - * Signals the audio output if it is open. This function locks the - * mutex. - */ -static void -audio_output_lock_signal(struct audio_output *ao) -{ - g_mutex_lock(ao->mutex); - 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 @@ -531,7 +518,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 */ |