From 19295c5d90aeb04f8664ab1a4cce83ddb480e85f Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 29 Nov 2009 13:13:28 +0200 Subject: [PATCH] Complete audio locking rules --- src/audio_output/common.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/audio_output/common.c b/src/audio_output/common.c index 585b771012..c1b199c3a5 100644 --- a/src/audio_output/common.c +++ b/src/audio_output/common.c @@ -117,10 +117,10 @@ static void aout_Destructor( vlc_object_t * p_this ) /* Lock ordering rules: * * Mixer Input IFIFO OFIFO (< Inner lock) - * Mixer No! N/A Yes Yes - * Input N/A No! Yes N/A + * Mixer No! Yes Yes Yes + * Input No! No! Yes Yes * In FIFOs No! No! No! Yes - * Out FIFOs No! N/A No! No! + * Out FIFOs No! No! No! No! * (^ Outer lock) */ #ifdef AOUT_DEBUG @@ -136,13 +136,13 @@ void aout_lock (unsigned i) allowed = 0; break; case INPUT_LOCK: - allowed = 0; + allowed = MIXER_LOCK; break; case INPUT_FIFO_LOCK: allowed = MIXER_LOCK|INPUT_LOCK; break; case OUTPUT_FIFO_LOCK: - allowed = MIXER_LOCK|INPUT_FIFO_LOCK; + allowed = MIXER_LOCK|INPUT_LOCK|INPUT_FIFO_LOCK; break; } -- 2.39.5