X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_objects.h;h=575e0ecad951efffe040d559bd5c775f1aa724c6;hb=73edaec8ab683970e1344eebf930565381d3d99d;hp=b9d9a94acb1b2ee0412427c2d77fb1daf967e837;hpb=5541a98c21c5a6a687d1aa441a9d50e34e0b582b;p=vlc

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index b9d9a94acb..575e0ecad9 100644
--- 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,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)
@@ -47,26 +47,26 @@
 #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_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)
@@ -111,8 +111,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) \
@@ -142,6 +146,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 * ) );
@@ -152,7 +162,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( bool, __vlc_object_wait, ( vlc_object_t * ) );
 #define vlc_object_wait( obj ) \
     __vlc_object_wait( VLC_OBJECT( obj ) )
 
@@ -177,7 +187,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) )
 
@@ -189,9 +199,9 @@ 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 = true;
 
     vlc_object_lock( obj );
     if( vlc_object_alive( obj ) )