From 3be1cdf8e0488a933371a6a45ced720d2aa67905 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 25 Mar 2009 18:04:41 +0100 Subject: [PATCH] output_all: synchronize playback with a notify object Use audio_output_client_notify instead of g_usleep(1ms) in audio_output_all_wait() to synchronize with the output_thread. Signal the audio_output_client_notify object in ao_play(). --- src/output_all.c | 3 +-- src/output_thread.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/output_all.c b/src/output_all.c index 870d8aed3..23d46b5f4 100644 --- a/src/output_all.c +++ b/src/output_all.c @@ -414,8 +414,7 @@ audio_output_all_wait(unsigned threshold) if (audio_output_all_check() < threshold) return true; - /* XXX synchronize in a better way */ - g_usleep(1000); + notify_wait(&audio_output_client_notify); return audio_output_all_check() < threshold; } diff --git a/src/output_thread.c b/src/output_thread.c index 62b893074..b545a62be 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -155,6 +155,8 @@ static void ao_play(struct audio_output *ao) ao->chunk_finished = true; g_mutex_unlock(ao->mutex); + + notify_signal(&audio_output_client_notify); } static void ao_pause(struct audio_output *ao)