Unexport vlc_object_waitpipe

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 080bb5463d5c5e7b7bbec145170239b63325e9a1..f1d72ec95524070d8cca875e9d875822323b5515 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -32,8 +32,6 @@
  */
 
 /* Object types */
-#define VLC_OBJECT_LIBVLC      (-2)
-#define VLC_OBJECT_MODULE      (-3)
 #define VLC_OBJECT_INTF        (-4)
 #define VLC_OBJECT_PLAYLIST    (-5)
 #define VLC_OBJECT_INPUT       (-7)
@@ -42,7 +40,6 @@
 #define VLC_OBJECT_AOUT        (-10)
 #define VLC_OBJECT_PACKETIZER  (-13)
 #define VLC_OBJECT_ENCODER     (-14)
-#define VLC_OBJECT_OPENGL      (-21)
 #define VLC_OBJECT_OSDMENU     (-28)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */
@@ -84,7 +81,7 @@ __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_yield, ( vlc_object_t * ) );
+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 * ) );
@@ -110,8 +107,8 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
 #define vlc_object_find_name(a,b,c) \
     vlc_object_find_name( VLC_OBJECT(a),b,c)
 
-#define vlc_object_yield(a) \
-    (typeof(a))__vlc_object_yield( VLC_OBJECT(a) )
+#define vlc_object_hold(a) \
+    __vlc_object_hold( VLC_OBJECT(a) )
 
 #define vlc_object_release(a) \
     __vlc_object_release( VLC_OBJECT(a) )
@@ -160,7 +157,3 @@ static inline bool __vlc_object_alive (const vlc_object_t *obj)
 
 #define vlc_object_alive(a) \
     __vlc_object_alive( VLC_OBJECT(a) )
-
-VLC_EXPORT( int, __vlc_object_waitpipe, ( vlc_object_t *obj ));
-#define vlc_object_waitpipe(a) \
-    __vlc_object_waitpipe( VLC_OBJECT(a) )