X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_objects.h;h=17e7cd964da8170b25bf74d64dd33db69cb31801;hb=7db94f4d2fc742537828fbe0c8eb5a6612601749;hp=151329801242a8c57d2aa12c7f40ab427265d1d0;hpb=fc4676a31814542d4980c6f71f38f87aa98bc7b1;p=vlc

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 1513298012..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 )
@@ -111,22 +114,11 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
     __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_assert_locked, ( vlc_object_t * ) );
-#define vlc_object_assert_locked( obj ) \
-    __vlc_object_assert_locked( VLC_OBJECT( obj ) )
-
 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 ();