[vlc-devel] commit: Privatize packetize and interface object types ( Rémi Denis-Courmont )
git version control
git at videolan.org
Mon Jan 19 20:16:09 CET 2009
vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Jan 19 20:57:35 2009 +0200| [ecd8f48066dd7ac510be1fb27d7f52969fa60028] | committer: Rémi Denis-Courmont
Privatize packetize and interface object types
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ecd8f48066dd7ac510be1fb27d7f52969fa60028
---
include/vlc_objects.h | 2 --
modules/misc/lua/libs/objects.c | 1 -
src/libvlc.h | 16 +++++++++++-----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index cb43516..afc1dfe 100644
--- 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 cbf5c37..6468f95 100644
--- 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 2b4aa5c..a9c74d3 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -43,17 +43,23 @@ 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
*/
/* 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__)
More information about the vlc-devel
mailing list