Commit ecd8f480 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Privatize packetize and interface object types

parent 6cf6df7c
......@@ -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 */
......
......@@ -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, "" } };
......
......@@ -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__)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment