Deprecate ugly and unsafe vlc_object_find_name()

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 151329801242a8c57d2aa12c7f40ab427265d1d0..804fc2010fa30c480d13e582673fc4ce29b24509 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -75,6 +75,9 @@ VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
 __attribute__((deprecated))
 #endif
 VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) );
+#if defined (__GNUC__) && !defined __cplusplus
+__attribute__((deprecated))
+#endif
 VLC_EXPORT( vlc_object_t *, vlc_object_find_name, ( vlc_object_t *, const char *, int ) );
 VLC_EXPORT( void *, __vlc_object_hold, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
@@ -111,18 +114,6 @@ 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) )