From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 29 Nov 2009 11:06:31 +0000 (+0200)
Subject: Adjust rules, output FIFO after input FIFOs
X-Git-Tag: 1.1.0-ff~2330
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=dec407e71ed6e4b9f41bd9344867a8dfccbfd15c;p=vlc

Adjust rules, output FIFO after input FIFOs
---

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;
     }