jvlc: mediaInstance renamed to mediaplayer in test methods

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 84745eb781fd5f77e26728dfc22e327d30e138ec..d870d0df011f5eefce006b5989aac340b367d32b 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -32,16 +32,13 @@
  */
 
 /* Object types */
-#define VLC_OBJECT_LIBVLC      (-2)
 #define VLC_OBJECT_INTF        (-4)
-#define VLC_OBJECT_PLAYLIST    (-5)
 #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_OPENGL      (-21)
 #define VLC_OBJECT_OSDMENU     (-28)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */
@@ -159,7 +156,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) )