X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_objects.h;h=e2fda545a74b1e2f687b8e5728e28c239950f7a4;hb=77c069c68936f12116a504b13d58257da7595542;hp=a034a6b654611ac756a25abdfb7a5c4a9229c47f;hpb=5aa33f1fab766842d59a7dcb7aa462aab9c681cf;p=vlc

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index a034a6b654..e2fda545a7 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,51 +107,18 @@ 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) )
 
 /* 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_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) )
+#define vlc_object_alive(a) vlc_object_alive( VLC_OBJECT(a) )