*/
/* Object types */
-#define VLC_OBJECT_LIBVLC (-2)
#define VLC_OBJECT_INTF (-4)
#define VLC_OBJECT_PLAYLIST (-5)
#define VLC_OBJECT_INPUT (-7)
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" },
/* 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 );
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 );