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 1115bbef81c33361484871183cb348085453ff43..7afa3815e425b9a5145b1bad367577814fbd5eeb 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_objects.h: vlc_object_t definition and manipulation methods
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
@@ -36,38 +36,39 @@
  */
 
 /* Object types */
-#define VLC_OBJECT_GLOBAL      (-1)
+
 #define VLC_OBJECT_LIBVLC      (-2)
 #define VLC_OBJECT_MODULE      (-3)
 #define VLC_OBJECT_INTF        (-4)
 #define VLC_OBJECT_PLAYLIST    (-5)
-#define VLC_OBJECT_ITEM        (-6)
+
 #define VLC_OBJECT_INPUT       (-7)
 #define VLC_OBJECT_DECODER     (-8)
 #define VLC_OBJECT_VOUT        (-9)
 #define VLC_OBJECT_AOUT        (-10)
 #define VLC_OBJECT_SOUT        (-11)
-#define VLC_OBJECT_HTTPD       (-12)
+
 #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)
 #define VLC_OBJECT_STREAM      (-20)
 #define VLC_OBJECT_OPENGL      (-21)
 #define VLC_OBJECT_FILTER      (-22)
-#define VLC_OBJECT_VOD         (-23)
-#define VLC_OBJECT_SPU         (-24)
-/*#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_CHROMA      (-33)
 
 #define VLC_OBJECT_GENERIC     (-666)
 
@@ -108,8 +109,12 @@ 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 */
+VLC_EXPORT( void, __vlc_object_dump, ( vlc_object_t *p_this ) );
+
 /*}@*/
 
 #define vlc_object_create(a,b) \
@@ -139,6 +144,12 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
 #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))
+
 
 /* Objects and threading */
 VLC_EXPORT( void, __vlc_object_lock, ( vlc_object_t * ) );
@@ -149,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( vlc_bool_t, __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 ) )
 
@@ -174,7 +185,7 @@ 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 * ) );
+VLC_EXPORT( bool, __vlc_object_alive, ( vlc_object_t * ) );
 #define vlc_object_alive(a) \
     __vlc_object_alive( VLC_OBJECT(a) )
 
@@ -186,13 +197,17 @@ VLC_EXPORT( int, __vlc_object_waitpipe, ( vlc_object_t *obj ));
  * See the vlc_object_alive() documentation for a better alternative.
  */
 static inline
-vlc_bool_t __vlc_object_lock_and_wait( vlc_object_t *obj )
+bool __vlc_object_lock_and_wait( vlc_object_t *obj )
 {
-    vlc_bool_t b = VLC_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;
 }