* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#if !defined( __LIBVLC__ )
- #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
/**
* \file
* This file defines the vlc_object_t structure and object types.
*/
/* Object types */
-
#define VLC_OBJECT_LIBVLC (-2)
#define VLC_OBJECT_MODULE (-3)
#define VLC_OBJECT_INTF (-4)
#define VLC_OBJECT_PLAYLIST (-5)
-
#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_PACKETIZER (-13)
#define VLC_OBJECT_ENCODER (-14)
-#define VLC_OBJECT_DIALOGS (-15)
-
#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_OSDMENU (-28)
-
-#define VLC_OBJECT_HTTPD_HOST (-30)
-
-#define VLC_OBJECT_INTERACTION (-32)
-
+/* Please add new object types below -34 */
+/* Please do not add new object types anyway */
#define VLC_OBJECT_GENERIC (-666)
/* Object search mode */
/* 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 :-)
*****************************************************************************/
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 */
#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))
#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 ) )
#define vlc_object_kill(a) \
__vlc_object_kill( VLC_OBJECT(a) )
-VLC_EXPORT( bool, __vlc_object_alive, ( vlc_object_t * ) );
+static inline bool __vlc_object_alive (const vlc_object_t *obj)
+{
+ barrier ();
+ return !obj->b_die;
+}
+
#define vlc_object_alive(a) \
__vlc_object_alive( VLC_OBJECT(a) )
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;
}