* @{
*/
-/* 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_PACKETIZER (-13)
-#define VLC_OBJECT_ENCODER (-14)
-#define VLC_OBJECT_ANNOUNCE (-17)
-#define VLC_OBJECT_OPENGL (-21)
-#define VLC_OBJECT_OSDMENU (-28)
-/* 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_PARENT 0x0001
-#define FIND_CHILD 0x0002
-#define FIND_ANYWHERE 0x0003
-
-#define FIND_STRICT 0x0010
-
/* Object flags */
-#define OBJECT_FLAGS_NODBG 0x0001
#define OBJECT_FLAGS_QUIET 0x0002
#define OBJECT_FLAGS_NOINTERACT 0x0004
-/* Types */
-typedef void (*vlc_destructor_t)(struct vlc_object_t *);
-
/*****************************************************************************
* The vlc_object_t type. Yes, it's that simple :-)
*****************************************************************************/
/*****************************************************************************
* 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 * ) );
-#if defined (__GNUC__) && !defined __cplusplus
-__attribute__((deprecated))
-#endif
-VLC_EXPORT( void *, vlc_object_get, ( libvlc_int_t *, int ) );
-VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) );
-VLC_EXPORT( vlc_object_t *, 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_API void *vlc_object_create( vlc_object_t *, size_t ) VLC_MALLOC VLC_USED;
+VLC_API vlc_object_t *vlc_object_find_name( vlc_object_t *, const char * ) VLC_USED VLC_DEPRECATED;
+VLC_API void * vlc_object_hold( vlc_object_t * );
+VLC_API void vlc_object_release( vlc_object_t * );
+VLC_API vlc_list_t *vlc_list_children( vlc_object_t * ) VLC_USED;
+VLC_API void vlc_list_release( vlc_list_t * );
+VLC_API char *vlc_object_get_name( const vlc_object_t * ) VLC_USED;
+#define vlc_object_get_name(o) vlc_object_get_name(VLC_OBJECT(o))
-#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_create(a,b) vlc_object_create( VLC_OBJECT(a), b )
-#define vlc_object_detach(a) \
- __vlc_object_detach( VLC_OBJECT(a) )
+#define vlc_object_find_name(a,b) \
+ vlc_object_find_name( VLC_OBJECT(a),b)
-#define vlc_object_attach(a,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)
-
-#define vlc_object_find_name(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) )
+ 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_API void vlc_object_kill( vlc_object_t * ) VLC_DEPRECATED;
#define vlc_object_kill(a) \
- __vlc_object_kill( VLC_OBJECT(a) )
+ vlc_object_kill( VLC_OBJECT(a) )
-static inline bool __vlc_object_alive (const vlc_object_t *obj)
+VLC_USED VLC_DEPRECATED
+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) )
+#define vlc_object_alive(a) vlc_object_alive( VLC_OBJECT(a) )
-VLC_EXPORT( int, __vlc_object_waitpipe, ( vlc_object_t *obj ));
-#define vlc_object_waitpipe(a) \
- __vlc_object_waitpipe( VLC_OBJECT(a) )
+/** @} */