Chroma API change. Chromas are now normal video filters (almost).

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 828510442a30f4d2184d91e75a27a85036d4d144..7afa3815e425b9a5145b1bad367577814fbd5eeb 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -36,7 +36,7 @@
  */
 
 /* Object types */
-#define VLC_OBJECT_GLOBAL      (-1)
+
 #define VLC_OBJECT_LIBVLC      (-2)
 #define VLC_OBJECT_MODULE      (-3)
 #define VLC_OBJECT_INTF        (-4)
@@ -51,7 +51,7 @@
 #define VLC_OBJECT_PACKETIZER  (-13)
 #define VLC_OBJECT_ENCODER     (-14)
 #define VLC_OBJECT_DIALOGS     (-15)
-#define VLC_OBJECT_VLM         (-16)
+
 #define VLC_OBJECT_ANNOUNCE    (-17)
 #define VLC_OBJECT_DEMUX       (-18)
 #define VLC_OBJECT_ACCESS      (-19)
@@ -68,6 +68,7 @@
 #define VLC_OBJECT_HTTPD_HOST  (-30)
 
 #define VLC_OBJECT_INTERACTION (-32)
+#define VLC_OBJECT_CHROMA      (-33)
 
 #define VLC_OBJECT_GENERIC     (-666)
 
@@ -86,9 +87,6 @@
 /* Types */
 typedef void (*vlc_destructor_t)(struct vlc_object_t *);
 
-/* Constants */
-VLC_PUBLIC_API const vlc_destructor_t kVLCDestructor;
-
 /*****************************************************************************
  * The vlc_object_t type. Yes, it's that simple :-)
  *****************************************************************************/
@@ -111,6 +109,7 @@ 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( vlc_list_t *, __vlc_list_children, ( vlc_object_t * ) );
 VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
 
 /* __vlc_object_dump */
@@ -145,6 +144,9 @@ VLC_EXPORT( void, __vlc_object_dump, ( vlc_object_t *p_this ) );
 #define vlc_list_find(a,b,c) \
     __vlc_list_find( VLC_OBJECT(a),b,c)
 
+#define vlc_list_children(a) \
+    __vlc_list_children( VLC_OBJECT(a) )
+
 #define vlc_object_dump(a) \
     __vlc_object_dump( VLC_OBJECT(a))
 
@@ -158,7 +160,7 @@ VLC_EXPORT( void, __vlc_object_unlock, ( vlc_object_t * ) );
 #define vlc_object_unlock( obj ) \
     __vlc_object_unlock( VLC_OBJECT( obj ) )
 
-VLC_EXPORT( bool, __vlc_object_wait, ( vlc_object_t * ) );
+VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) );
 #define vlc_object_wait( obj ) \
     __vlc_object_wait( VLC_OBJECT( obj ) )
 
@@ -197,11 +199,15 @@ VLC_EXPORT( int, __vlc_object_waitpipe, ( vlc_object_t *obj ));
 static inline
 bool __vlc_object_lock_and_wait( vlc_object_t *obj )
 {
-    bool b = true;
+    bool b;
 
     vlc_object_lock( obj );
-    if( vlc_object_alive( obj ) )
-        b = vlc_object_wait( obj );
+    b = vlc_object_alive( obj );
+    if( b )
+    {
+        vlc_object_wait( obj );
+        b = vlc_object_alive( obj );
+    }
     vlc_object_unlock( obj );
     return b;
 }