[vlc-devel] commit: Complete audio locking rules ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 29 13:13:28 2009 +0200| [19295c5d90aeb04f8664ab1a4cce83ddb480e85f] | committer: Rémi Denis-Courmont 

Complete audio locking rules

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=19295c5d90aeb04f8664ab1a4cce83ddb480e85f
---

 src/audio_output/common.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 585b771..c1b199c 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;
     }