Remove LiveTV menu.

[vuplus_xbmc] / xbmc / threads / Lockables.h

diff --git a/xbmc/threads/Lockables.h b/xbmc/threads/Lockables.h
index 40c8a7a..865a258 100644 (file)
--- a/xbmc/threads/Lockables.h
+++ b/xbmc/threads/Lockables.h
@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://www.xbmc.org
+ *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -48,6 +48,7 @@ namespace XbmcThreads
    */
   template<class L> class CountingLockable : public NonCopyable
   {
+    friend class ConditionVariable;
   protected:
     L mutex;
     unsigned int count;
@@ -62,21 +63,31 @@ namespace XbmcThreads
 
     /**
      * This implements the "exitable" behavior mentioned above.
+     *
+     * This can be used to ALMOST exit, but not quite, by passing
+     *  the number of locks to leave. This is used in the windows
+     *  ConditionVariable which requires that the lock be entered
+     *  only once, and so it backs out ALMOST all the way, but
+     *  leaves one still there.
      */
-    inline unsigned int exit() 
+    inline unsigned int exit(unsigned int leave = 0) 
     { 
       // it's possibe we don't actually own the lock
       // so we will try it.
       unsigned int ret = 0;
       if (try_lock())
       {
-        ret = count - 1;  // The -1 is because we don't want 
-                          //  to count the try_lock increment.
-        // We must NOT compare "count" in this loop since 
-        // as soon as the last unlock is called another thread
-        // can modify it.
-        for (unsigned int i = 0; i <= ret; i++) // This will also unlock the try_lock.
-          unlock();
+        if (leave < (count - 1))
+        {
+          ret = count - 1 - leave;  // The -1 is because we don't want 
+                                    //  to count the try_lock increment.
+          // We must NOT compare "count" in this loop since 
+          // as soon as the last unlock is called another thread
+          // can modify it.
+          for (unsigned int i = 0; i < ret; i++)
+            unlock();
+        }
+        unlock(); // undo the try_lock before returning
       }
 
       return ret;