vlc_mutex_locker: automatic mutex locking for C++

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 4ab92c2d03f26c9f2094a3f465d9ba62df811f36..7b66e5b07cbee6dd6f90be6f2258f3ae84ae098a 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -448,4 +448,27 @@ static inline void barrier (void)
 #define vlc_thread_join( P_THIS )                                           \
     __vlc_thread_join( VLC_OBJECT(P_THIS) )
 
+#ifdef __cplusplus
+/**
+ * Helper C++ class to lock a mutex.
+ * The mutex is locked when the object is created, and unlocked when the object
+ * is destroyed.
+ */
+class vlc_mutex_locker
+{
+    private:
+        vlc_mutex_t *lock;
+    public:
+        vlc_mutex_locker (vlc_mutex_t *m) : lock (m)
+        {
+            vlc_mutex_lock (lock);
+        }
+
+        ~vlc_mutex_locker (void)
+        {
+            vlc_mutex_unlock (lock);
+        }
+};
+#endif
+
 #endif /* !_VLC_THREADS_H */