From d699c5c3f62a1a5086ccf9269d2785e319dce702 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 28 Sep 2008 20:51:36 +0300 Subject: [PATCH] Remove VLC_OBJECT_LIBVLC --- include/vlc_objects.h | 1 - modules/misc/lua/libs/objects.c | 3 +-- src/libvlc.c | 2 +- src/misc/objects.c | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index aac0042f24..d53f4d3d6e 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -32,7 +32,6 @@ */ /* Object types */ -#define VLC_OBJECT_LIBVLC (-2) #define VLC_OBJECT_INTF (-4) #define VLC_OBJECT_PLAYLIST (-5) #define VLC_OBJECT_INPUT (-7) diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c index 593bd1fe19..8621ffe369 100644 --- a/modules/misc/lua/libs/objects.c +++ b/modules/misc/lua/libs/objects.c @@ -89,8 +89,7 @@ static int vlc_object_type_from_string( const char *psz_name ) int i_type; const char *psz_name; } pp_objects[] = - { { VLC_OBJECT_LIBVLC, "libvlc" }, - { VLC_OBJECT_INTF, "intf" }, + { { VLC_OBJECT_INTF, "intf" }, { VLC_OBJECT_INPUT, "input" }, { VLC_OBJECT_DECODER, "decoder" }, { VLC_OBJECT_VOUT, "vout" }, diff --git a/src/libvlc.c b/src/libvlc.c index 3c8df8f9c2..7a905e2929 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -256,7 +256,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) /* Allocate a libvlc instance object */ p_libvlc = __vlc_custom_create( NULL, sizeof (*priv), - VLC_OBJECT_LIBVLC, "libvlc" ); + VLC_OBJECT_GENERIC, "libvlc" ); if( p_libvlc != NULL ) i_instances++; vlc_mutex_unlock( lock ); diff --git a/src/misc/objects.c b/src/misc/objects.c index d55f41ab20..f626362c98 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -183,8 +183,8 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, vlc_internals (p_priv->prev)->next = p_new; libvlc_unlock (p_new->p_libvlc); - if( i_type == VLC_OBJECT_LIBVLC ) - { + if (p_new == VLC_OBJECT(p_new->p_libvlc)) + { /* TODO: should be in src/libvlc.c */ int canc = vlc_savecancel (); var_Create( p_new, "list", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); var_AddCallback( p_new, "list", DumpCommand, NULL ); -- 2.39.2