From dec407e71ed6e4b9f41bd9344867a8dfccbfd15c Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 29 Nov 2009 13:06:31 +0200 Subject: [PATCH] Adjust rules, output FIFO after input FIFOs --- src/audio_output/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audio_output/common.c b/src/audio_output/common.c index 0c9cda76bc..8b84580577 100644 --- a/src/audio_output/common.c +++ b/src/audio_output/common.c @@ -119,8 +119,8 @@ static void aout_Destructor( vlc_object_t * p_this ) * Mixer Input IFIFO OFIFO (< Inner lock) * Mixer No! N/A Yes Yes * Input N/A No! Yes N/A - * In FIFOs No! No! No! No! - * Out FIFOs No! N/A Yes No! + * In FIFOs No! No! No! Yes + * Out FIFOs No! N/A No! No! * (^ Outer lock) */ #ifdef AOUT_DEBUG @@ -138,11 +138,11 @@ void aout_lock (unsigned i) case INPUT_LOCK: allowed = 0; break; - case OUTPUT_FIFO_LOCK: - allowed = MIXER_LOCK; - break; case INPUT_FIFO_LOCK: - allowed = MIXER_LOCK|INPUT_LOCK|OUTPUT_FIFO_LOCK; + allowed = MIXER_LOCK|INPUT_LOCK; + break; + case OUTPUT_FIFO_LOCK: + allowed = MIXER_LOCK|INPUT_FIFO_LOCK; break; } -- 2.39.2