* 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 */
#define FIND_CHILD 0x0002
#define FIND_ANYWHERE 0x0003
-#define FIND_STRICT 0x0010
-
/* Object flags */
#define OBJECT_FLAGS_NODBG 0x0001
#define OBJECT_FLAGS_QUIET 0x0002
/*****************************************************************************
* Prototypes
*****************************************************************************/
-VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) );
-VLC_EXPORT( void, __vlc_object_set_destructor, ( vlc_object_t *, vlc_destructor_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, ( 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( vlc_list_t *, __vlc_list_children, ( vlc_object_t * ) );
+VLC_EXPORT( void *, vlc_object_create, ( vlc_object_t *, size_t ) ) LIBVLC_MALLOC LIBVLC_USED;
+VLC_EXPORT( void, vlc_object_set_destructor, ( vlc_object_t *, vlc_destructor_t ) );
+VLC_EXPORT( void, vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
+#if defined (__GNUC__) && !defined __cplusplus
+__attribute__((deprecated))
+#endif
+VLC_EXPORT( void *, vlc_object_find, ( vlc_object_t *, int, int ) ) LIBVLC_USED;
+#if defined (__GNUC__) && !defined __cplusplus
+__attribute__((deprecated))
+#endif
+VLC_EXPORT( vlc_object_t *, vlc_object_find_name, ( vlc_object_t *, const char *, int ) ) LIBVLC_USED;
+VLC_EXPORT( void *, vlc_object_hold, ( vlc_object_t * ) );
+VLC_EXPORT( void, vlc_object_release, ( vlc_object_t * ) );
+VLC_EXPORT( vlc_list_t *, vlc_list_children, ( vlc_object_t * ) ) LIBVLC_USED;
VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
+VLC_EXPORT( char *, vlc_object_get_name, ( const vlc_object_t * ) ) LIBVLC_USED;
+#define vlc_object_get_name(o) vlc_object_get_name(VLC_OBJECT(o))
-/* __vlc_object_dump */
-VLC_EXPORT( void, __vlc_object_dump, ( vlc_object_t *p_this ) );
+/**}@*/
-/*}@*/
-
-#define vlc_object_create(a,b) \
- __vlc_object_create( VLC_OBJECT(a), b )
+#define vlc_object_create(a,b) vlc_object_create( VLC_OBJECT(a), b )
#define vlc_object_set_destructor(a,b) \
- __vlc_object_set_destructor( VLC_OBJECT(a), b )
-
-#define vlc_object_detach(a) \
- __vlc_object_detach( VLC_OBJECT(a) )
+ vlc_object_set_destructor( VLC_OBJECT(a), b )
#define vlc_object_attach(a,b) \
- __vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) )
+ vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) )
#define vlc_object_find(a,b,c) \
- __vlc_object_find( VLC_OBJECT(a),b,c)
+ vlc_object_find( VLC_OBJECT(a),b,c)
#define vlc_object_find_name(a,b,c) \
- __vlc_object_find_name( VLC_OBJECT(a),b,c)
+ vlc_object_find_name( VLC_OBJECT(a),b,c)
-#define vlc_object_yield(a) \
- __vlc_object_yield( VLC_OBJECT(a) )
+#define vlc_object_hold(a) \
+ vlc_object_hold( VLC_OBJECT(a) )
#define vlc_object_release(a) \
- __vlc_object_release( VLC_OBJECT(a) )
-
-#define vlc_list_find(a,b,c) \
- __vlc_list_find( VLC_OBJECT(a),b,c)
+ vlc_object_release( VLC_OBJECT(a) )
#define vlc_list_children(a) \
- __vlc_list_children( VLC_OBJECT(a) )
-
-#define vlc_object_dump(a) \
- __vlc_object_dump( VLC_OBJECT(a))
-
+ vlc_list_children( VLC_OBJECT(a) )
/* 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( void, __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 * ) );
+VLC_EXPORT( void, vlc_object_kill, ( vlc_object_t * ) );
#define vlc_object_kill(a) \
- __vlc_object_kill( VLC_OBJECT(a) )
-
-VLC_EXPORT( bool, __vlc_object_alive, ( vlc_object_t * ) );
-#define vlc_object_alive(a) \
- __vlc_object_alive( VLC_OBJECT(a) )
+ vlc_object_kill( 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
-bool __vlc_object_lock_and_wait( vlc_object_t *obj )
+LIBVLC_USED
+static inline bool vlc_object_alive (const vlc_object_t *obj)
{
- bool b;
-
- vlc_object_lock( obj );
- b = vlc_object_alive( obj );
- if( b )
- {
- vlc_object_wait( obj );
- b = vlc_object_alive( obj );
- }
- vlc_object_unlock( obj );
- return b;
+ barrier ();
+ return !obj->b_die;
}
-#define vlc_object_lock_and_wait( obj ) \
- __vlc_object_lock_and_wait( VLC_OBJECT(obj) )
+#define vlc_object_alive(a) vlc_object_alive( VLC_OBJECT(a) )
+/** @} */