new (failing) test for ticket #1527 added

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 6058b0b2eb2521cfe3b9f048f59d28f35b172666..aa4d1dc5bc236b9721b1d5816877c1b835ec651c 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -60,13 +60,14 @@
 #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)
 #define VLC_OBJECT_STATS       (-29)
 #define VLC_OBJECT_HTTPD_HOST  (-30)
 #define VLC_OBJECT_META_ENGINE (-31)
+#define VLC_OBJECT_INTERACTION (-32)
 
 #define VLC_OBJECT_GENERIC     (-666)
 
@@ -95,46 +96,27 @@ struct vlc_object_t
  * Prototypes
  *****************************************************************************/
 VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) );
-VLC_EXPORT( void, __vlc_object_destroy, ( vlc_object_t * ) );
-VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
-VLC_EXPORT( vlc_bool_t, __vlc_object_dying_unlocked, ( vlc_object_t * ) );
-VLC_EXPORT( vlc_bool_t, __vlc_object_dying, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
-VLC_EXPORT( void *, __vlc_object_get, ( vlc_object_t *, int ) );
+VLC_EXPORT( void *, vlc_object_get, ( int ) );
 VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) );
 VLC_EXPORT( void *, __vlc_object_find_name, ( vlc_object_t *, const char *, int ) );
 VLC_EXPORT( void, __vlc_object_yield, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
 VLC_EXPORT( vlc_list_t *, __vlc_list_find, ( vlc_object_t *, int, int ) );
 VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
-VLC_EXPORT( libvlc_int_t *, vlc_current_object, ( int ) );
-
-#if defined( WIN32 ) || defined( SYS_BEOS ) || defined( __APPLE__ )
-VLC_EXPORT( const char *, vlc_path, ( vlc_object_t * ) );
-#endif
 
 /*}@*/
 
 #define vlc_object_create(a,b) \
     __vlc_object_create( VLC_OBJECT(a), b )
 
-#define vlc_object_destroy(a) do { \
-    __vlc_object_destroy( VLC_OBJECT(a) ); \
-    (a) = NULL; } while(0)
-
-#define vlc_object_kill(a) \
-    __vlc_object_kill( VLC_OBJECT(a) )
-
 #define vlc_object_detach(a) \
     __vlc_object_detach( VLC_OBJECT(a) )
 
 #define vlc_object_attach(a,b) \
     __vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) )
 
-#define vlc_object_get(a,b) \
-    __vlc_object_get( VLC_OBJECT(a),b)
-
 #define vlc_object_find(a,b,c) \
     __vlc_object_find( VLC_OBJECT(a),b,c)
 
@@ -149,3 +131,65 @@ VLC_EXPORT( const char *, vlc_path, ( vlc_object_t * ) );
 
 #define vlc_list_find(a,b,c) \
     __vlc_list_find( VLC_OBJECT(a),b,c)
+
+
+/* Objects and threading */
+VLC_EXPORT( void, __vlc_object_lock, ( vlc_object_t * ) );
+#define vlc_object_lock( obj ) \
+    __vlc_object_lock( VLC_OBJECT( obj ) )
+
+VLC_EXPORT( void, __vlc_object_unlock, ( vlc_object_t * ) );
+#define vlc_object_unlock( obj ) \
+    __vlc_object_unlock( VLC_OBJECT( obj ) )
+
+VLC_EXPORT( vlc_bool_t, __vlc_object_wait, ( vlc_object_t * ) );
+#define vlc_object_wait( obj ) \
+    __vlc_object_wait( VLC_OBJECT( obj ) )
+
+VLC_EXPORT( int, __vlc_object_timedwait, ( vlc_object_t *, mtime_t ) );
+#define vlc_object_timedwait( obj, d ) \
+    __vlc_object_timedwait( VLC_OBJECT( obj ), d )
+
+VLC_EXPORT( void, __vlc_object_signal_unlocked, ( vlc_object_t * ) );
+#define vlc_object_signal_unlocked( obj ) \
+    __vlc_object_signal_unlocked( VLC_OBJECT( obj ) )
+
+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) )
+
+VLC_EXPORT( vlc_bool_t, __vlc_object_alive, ( vlc_object_t * ) );
+#define vlc_object_alive(a) \
+    __vlc_object_alive( VLC_OBJECT(a) )
+
+VLC_EXPORT( int, __vlc_object_waitpipe, ( vlc_object_t *obj ));
+#define vlc_object_waitpipe(a) \
+    __vlc_object_waitpipe( VLC_OBJECT(a) )
+
+/* NOTE: this function is a *temporary* convenience.
+ * See the vlc_object_alive() documentation for a better alternative.
+ */
+static inline
+vlc_bool_t __vlc_object_lock_and_wait( vlc_object_t *obj )
+{
+    vlc_bool_t b = VLC_TRUE;
+
+    vlc_object_lock( obj );
+    if( vlc_object_alive( obj ) )
+        b = vlc_object_wait( obj );
+    vlc_object_unlock( obj );
+    return b;
+}
+#define vlc_object_lock_and_wait( obj ) \
+    __vlc_object_lock_and_wait( VLC_OBJECT(obj) )
+
+