Remove VLC_OBJECT_LIBVLC

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index aac0042f24c6deafb4af41273440fef3ef69cddd..d53f4d3d6e970daf2076bd5fa80e6ae783392cc7 100644 (file)
--- 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 593bd1fe1941d8f77d3c9edbf8e8943d27575c6f..8621ffe36953da5fb006cef9ea09b880e4b8e0f5 100644 (file)
--- 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 3c8df8f9c2bf2c6b0047670db6d53f8da344141d..7a905e29293e31e9caabdff6ad96d43e126a44f1 100644 (file)
--- 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 d55f41ab206c0e7586ac83bcab2488f5f7512ae5..f626362c9878b1daae42599135127c689f221c24 100644 (file)
--- 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 );