*/
/* 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_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)
#endif
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_hold, ( 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 * ) );
#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)
-
#define vlc_list_children(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( 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 * ) );
#define vlc_object_kill(a) \
__vlc_object_kill( VLC_OBJECT(a) )
-static inline bool __vlc_object_alive (const vlc_object_t *obj)
+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) )
-
-VLC_EXPORT( int, __vlc_object_waitpipe, ( vlc_object_t *obj ));
-#define vlc_object_waitpipe(a) \
- __vlc_object_waitpipe( VLC_OBJECT(a) )
+#define vlc_object_alive(a) vlc_object_alive( VLC_OBJECT(a) )