Commit dec407e7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Adjust rules, output FIFO after input FIFOs

parent 7a87d576
...@@ -119,8 +119,8 @@ static void aout_Destructor( vlc_object_t * p_this ) ...@@ -119,8 +119,8 @@ static void aout_Destructor( vlc_object_t * p_this )
* Mixer Input IFIFO OFIFO (< Inner lock) * Mixer Input IFIFO OFIFO (< Inner lock)
* Mixer No! N/A Yes Yes * Mixer No! N/A Yes Yes
* Input N/A No! Yes N/A * Input N/A No! Yes N/A
* In FIFOs No! No! No! No! * In FIFOs No! No! No! Yes
* Out FIFOs No! N/A Yes No! * Out FIFOs No! N/A No! No!
* (^ Outer lock) * (^ Outer lock)
*/ */
#ifdef AOUT_DEBUG #ifdef AOUT_DEBUG
...@@ -138,11 +138,11 @@ void aout_lock (unsigned i) ...@@ -138,11 +138,11 @@ void aout_lock (unsigned i)
case INPUT_LOCK: case INPUT_LOCK:
allowed = 0; allowed = 0;
break; break;
case OUTPUT_FIFO_LOCK:
allowed = MIXER_LOCK;
break;
case INPUT_FIFO_LOCK: 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; break;
} }
......
Supports Markdown
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