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

Remove VLC_OBJECT_(ACCESS|DEMUX|STREAM) types

parent 1a7f1a44
......@@ -44,9 +44,6 @@
#define VLC_OBJECT_ENCODER (-14)
#define VLC_OBJECT_DIALOGS (-15)
#define VLC_OBJECT_ANNOUNCE (-17)
#define VLC_OBJECT_DEMUX (-18)
#define VLC_OBJECT_ACCESS (-19)
#define VLC_OBJECT_STREAM (-20)
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_FILTER (-22)
#define VLC_OBJECT_OSDMENU (-28)
......
......@@ -100,9 +100,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{ VLC_OBJECT_ENCODER, "encoder" },
{ VLC_OBJECT_DIALOGS, "dialogs" },
{ VLC_OBJECT_ANNOUNCE, "announce" },
{ VLC_OBJECT_DEMUX, "demux" },
{ VLC_OBJECT_ACCESS, "access" },
{ VLC_OBJECT_STREAM, "stream" },
{ VLC_OBJECT_OPENGL, "opengl" },
{ VLC_OBJECT_FILTER, "filter" },
{ VLC_OBJECT_OSDMENU, "osdmenu" },
......
......@@ -36,7 +36,9 @@ static access_t *access_InternalNew( vlc_object_t *p_obj, const char *psz_access
const char *psz_demux, const char *psz_path,
access_t *p_source )
{
access_t *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
static const char typename[] = "access";
access_t *p_access = vlc_custom_create( p_obj, sizeof (*p_access),
VLC_OBJECT_GENERIC, typename );
if( p_access == NULL )
return NULL;
......
......@@ -41,7 +41,9 @@ demux_t *__demux_New( vlc_object_t *p_obj,
const char *psz_path,
stream_t *s, es_out_t *out, bool b_quick )
{
demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX );
static const char typename[] = "demux";
demux_t *p_demux = vlc_custom_create( p_obj, sizeof( *p_demux ),
VLC_OBJECT_GENERIC, typename );
const char *psz_module;
if( p_demux == NULL ) return NULL;
......
......@@ -461,7 +461,7 @@ struct stream_t
static inline stream_t *vlc_stream_create( vlc_object_t *obj )
{
return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
VLC_OBJECT_STREAM, "stream" );
VLC_OBJECT_GENERIC, "stream" );
}
#endif
......@@ -238,14 +238,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof(intf_thread_t);
psz_type = "dialogs";
break;
case VLC_OBJECT_DEMUX:
i_size = sizeof(demux_t);
psz_type = "demux";
break;
case VLC_OBJECT_ACCESS:
i_size = sizeof(access_t);
psz_type = "access";
break;
case VLC_OBJECT_DECODER:
i_size = sizeof(decoder_t);
psz_type = "decoder";
......
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