Privatize packetize and interface object types

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index cb435161dc0082b8d9874a5172f691bb7e13c66c..afc1dfe470edde617d69425a82fb85e9233091ff 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -32,12 +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)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */

diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c
index cbf5c374067ab8eadf6c9103e50ff7584f29b4e1..6468f9530eb200faff9b414af72494809e7df0a4 100644 (file)
--- a/modules/misc/lua/libs/objects.c
+++ b/modules/misc/lua/libs/objects.c
@@ -93,7 +93,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_DECODER, "decoder" },
           { VLC_OBJECT_VOUT, "vout" },
           { VLC_OBJECT_AOUT, "aout" },
-          { VLC_OBJECT_PACKETIZER, "packetizer" },
           { VLC_OBJECT_ENCODER, "encoder" },
           { VLC_OBJECT_GENERIC, "generic" },
           { 0, "" } };

diff --git a/src/libvlc.h b/src/libvlc.h
index 2b4aa5c5d36ccab29144492aec280267e68f30b1..a9c74d39ce1c959686e4c47c8e4f0e758a3e3457 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -42,6 +42,17 @@ void system_Init      ( libvlc_int_t *, int *, const char *[] );
 void system_Configure ( libvlc_int_t *, int *, const char *[] );
 void system_End       ( libvlc_int_t * );
 
+/*
+ * Legacy object stuff that is still used within libvlccore (only)
+ */
+void __vlc_object_signal_unlocked (vlc_object_t *);
+#define vlc_object_signal_unlocked( obj ) \
+    __vlc_object_signal_unlocked( VLC_OBJECT( obj ) )
+
+vlc_list_t *vlc_list_find( vlc_object_t *, int, int );
+#define VLC_OBJECT_INTF        (-4)
+#define VLC_OBJECT_PACKETIZER  (-13)
+
 /*
  * Threads subsystem
  */
@@ -49,11 +60,6 @@ void system_End       ( libvlc_int_t * );
 /* Hopefully, no need to export this. There is a new thread API instead. */
 void vlc_thread_cancel (vlc_object_t *);
 int vlc_object_waitpipe (vlc_object_t *obj);
-void __vlc_object_signal_unlocked (vlc_object_t *);
-#define vlc_object_signal_unlocked( obj ) \
-    __vlc_object_signal_unlocked( VLC_OBJECT( obj ) )
-
-vlc_list_t *vlc_list_find( vlc_object_t *, int, int ); /* legacy */
 
 void vlc_trace (const char *fn, const char *file, unsigned line);
 #define vlc_backtrace() vlc_trace(__func__, __FILE__, __LINE__)