X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_objects.h;h=151329801242a8c57d2aa12c7f40ab427265d1d0;hb=fc4676a31814542d4980c6f71f38f87aa98bc7b1;hp=969189050543d6d360d6e3b74e4e8c9fd838a6b4;hpb=99830a17866b666cd7609943a93131af58441376;p=vlc

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 9691890505..1513298012 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -32,14 +32,10 @@
  */
 
 /* Object types */
-#define VLC_OBJECT_INTF        (-4)
 #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_OSDMENU     (-28)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */
 #define VLC_OBJECT_GENERIC     (-666)
@@ -82,7 +78,6 @@ 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_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 * ) );
 
@@ -112,9 +107,6 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
 #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) )
 
@@ -131,13 +123,6 @@ VLC_EXPORT( void, __vlc_object_assert_locked, ( vlc_object_t * ) );
 #define vlc_object_assert_locked( obj ) \
     __vlc_object_assert_locked( VLC_OBJECT( obj ) )
 
-#if defined (__GNUC__) && !defined __cplusplus
-__attribute__((deprecated))
-#endif
-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_kill, ( vlc_object_t * ) );
 #define vlc_object_kill(a) \
     __vlc_object_kill( VLC_OBJECT(a) )