Skip to content

V
vlc-2-2
Commit 19295c5d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Complete audio locking rules

parent 4c627dc6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/audio_output/common.c
View file @ 19295c5d
...@@ -117,10 +117,10 @@ static void aout_Destructor( vlc_object_t * p_this ) ...@@ -117,10 +117,10 @@ static void aout_Destructor( vlc_object_t * p_this )
/* Lock ordering rules: /* Lock ordering rules:
* *
* Mixer Input IFIFO OFIFO (< Inner lock) * Mixer Input IFIFO OFIFO (< Inner lock)
* Mixer No! N/A Yes Yes * Mixer No! Yes Yes Yes
* Input N/A No! Yes N/A * Input No! No! Yes Yes
* In FIFOs No! No! No! Yes * In FIFOs No! No! No! Yes
* Out FIFOs No! N/A No! No! * Out FIFOs No! No! No! No!
* (^ Outer lock) * (^ Outer lock)
*/ */
#ifdef AOUT_DEBUG #ifdef AOUT_DEBUG
...@@ -136,13 +136,13 @@ void aout_lock (unsigned i) ...@@ -136,13 +136,13 @@ void aout_lock (unsigned i)
allowed = 0; allowed = 0;
break; break;
case INPUT_LOCK: case INPUT_LOCK:
allowed = 0; allowed = MIXER_LOCK;
break; break;
case INPUT_FIFO_LOCK: case INPUT_FIFO_LOCK:
allowed = MIXER_LOCK|INPUT_LOCK; allowed = MIXER_LOCK|INPUT_LOCK;
break; break;
case OUTPUT_FIFO_LOCK: case OUTPUT_FIFO_LOCK:
allowed = MIXER_LOCK|INPUT_FIFO_LOCK; allowed = MIXER_LOCK|INPUT_LOCK|INPUT_FIFO_LOCK;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment