X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_objects.h;h=17e7cd964da8170b25bf74d64dd33db69cb31801;hb=c07eff528deb31d8b430d82f28b19eb33dbcd4d9;hp=e2fda545a74b1e2f687b8e5728e28c239950f7a4;hpb=df85fc8b8befb1a0cc8b8007d99d82bfac26b249;p=vlc diff --git a/include/vlc_objects.h b/include/vlc_objects.h index e2fda545a7..17e7cd964d 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -45,8 +45,6 @@ #define FIND_CHILD 0x0002 #define FIND_ANYWHERE 0x0003 -#define FIND_STRICT 0x0010 - /* Object flags */ #define OBJECT_FLAGS_NODBG 0x0001 #define OBJECT_FLAGS_QUIET 0x0002 @@ -67,21 +65,26 @@ struct vlc_object_t /***************************************************************************** * Prototypes *****************************************************************************/ -VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) ); +VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) ) 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 * ) ); VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) ); #if defined (__GNUC__) && !defined __cplusplus __attribute__((deprecated)) #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_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 * ) ); +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)) -/*}@*/ +/**}@*/ #define vlc_object_create(a,b) \ __vlc_object_create( VLC_OBJECT(a), b ) @@ -115,6 +118,7 @@ VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) ); #define vlc_object_kill(a) \ __vlc_object_kill( VLC_OBJECT(a) ) +LIBVLC_USED static inline bool vlc_object_alive (const vlc_object_t *obj) { barrier ();