qt4: fix the use of HTTP in open dialog

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 03893fd33ed9d11bdd6d5c331e630a0aa080e0a0..bbf3121601ef0498c923c1ae01ecafda07f73ef4 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -60,7 +60,7 @@
 #define VLC_OBJECT_FILTER      (-22)
 #define VLC_OBJECT_VOD         (-23)
 #define VLC_OBJECT_SPU         (-24)
-#define VLC_OBJECT_TLS         (-25)
+/*#define VLC_OBJECT_xxx         (-25) - formerly TLS */
 #define VLC_OBJECT_SD          (-26)
 #define VLC_OBJECT_XML         (-27)
 #define VLC_OBJECT_OSDMENU     (-28)
@@ -163,6 +163,8 @@ vlc_bool_t __vlc_object_lock_and_wait( vlc_object_t *obj )
     vlc_object_unlock( obj );
     return b;
 }
+#define vlc_object_lock_and_wait( obj ) \
+    __vlc_object_lock_and_wait( VLC_OBJECT(obj) )
 
 VLC_EXPORT( int, __vlc_object_timedwait, ( vlc_object_t *, mtime_t ) );
 #define vlc_object_timedwait( obj, d ) \
@@ -172,10 +174,17 @@ VLC_EXPORT( void, __vlc_object_signal_unlocked, ( vlc_object_t * ) );
 #define vlc_object_signal_unlocked( obj ) \
     __vlc_object_signal_unlocked( VLC_OBJECT( obj ) )
 
-VLC_EXPORT( void, __vlc_object_signal, ( vlc_object_t * ) );
+static inline void __vlc_object_signal( vlc_object_t *obj )
+{
+    vlc_object_lock( obj );
+    vlc_object_signal_unlocked( obj );
+    vlc_object_unlock( obj );
+}
 #define vlc_object_signal( obj ) \
     __vlc_object_signal( VLC_OBJECT( obj ) )
 
 VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
 #define vlc_object_kill(a) \
     __vlc_object_kill( VLC_OBJECT(a) )
+
+int vlc_object_waitpipe( vlc_object_t *obj );