#if defined (__GNUC__) && !defined __cplusplus
__attribute__((deprecated))
#endif
-VLC_EXPORT( void *, vlc_object_get, ( int ) );
+VLC_EXPORT( void *, vlc_object_get, ( libvlc_int_t *, int ) );
VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) );
VLC_EXPORT( void *, __vlc_object_find_name, ( vlc_object_t *, const char *, int ) );
VLC_EXPORT( void, __vlc_object_yield, ( vlc_object_t * ) );
VideoWidget::~VideoWidget()
{
vout_thread_t *p_vout = i_vout ?
- (vout_thread_t *)vlc_object_get( i_vout ) : NULL;
+ (vout_thread_t *)vlc_object_get( p_intf->p_libvlc, i_vout ) : NULL;
if( p_vout )
{
}
else
{
- p_object = ( vlc_object_t * )vlc_object_get( objects[i] );
+ p_object = ( vlc_object_t * )vlc_object_get( p_intf->p_libvlc, objects[i] );
if( !p_object )
{
msg_Warn( p_intf, "object %d not found !", objects[i] );
void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data )
{
MenuItemData *itemData = qobject_cast<MenuItemData *>( data );
- vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( itemData->i_object_id );
+ vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( p_intf->p_libvlc, itemData->i_object_id );
if( p_object == NULL ) return;
var_Set( p_object, itemData->psz_var, itemData->val );
continue;
}
- p_object = (vlc_object_t *)vlc_object_get( pi_objects[i] );
+ p_object = (vlc_object_t *)vlc_object_get( p_intf->p_libvlc, pi_objects[i] );
if( p_object == NULL ) continue;
b_section_empty = false;
if( p_menuitemext )
{
vlc_object_t *p_object = (vlc_object_t *)
- vlc_object_get( p_menuitemext->i_object_id );
+ vlc_object_get( p_intf->p_libvlc, p_menuitemext->i_object_id );
if( p_object == NULL ) return;
var_Set( p_object, p_menuitemext->psz_var, p_menuitemext->val );
continue;
}
- p_object = (vlc_object_t *)vlc_object_get( rai_objects[i] );
+ p_object = (vlc_object_t *)vlc_object_get( p_intf->p_libvlc, rai_objects[i] );
if( p_object == NULL ) continue;
b_section_empty = false;
wxMenuItemExt *p_menuitemext = (wxMenuItemExt *)p_menuitem;
vlc_object_t *p_object;
- p_object = (vlc_object_t *)vlc_object_get( p_menuitemext->i_object_id );
+ p_object = (vlc_object_t *)vlc_object_get( p_intf->p_libvlc, p_menuitemext->i_object_id );
if( p_object == NULL ) return;
wxMutexGuiLeave(); // We don't want deadlocks
* vlc_object_yield(), use the pointer as your reference, and call
* vlc_object_release() when you're done.
*/
-void * vlc_object_get( int i_id )
+void * vlc_object_get( libvlc_int_t *p_anchor, int i_id )
{
- libvlc_global_data_t *p_libvlc_global = vlc_global();
vlc_object_t *obj = NULL;
#ifndef NDEBUG
int canc = vlc_savecancel ();
#endif
vlc_mutex_lock( &structure_lock );
- for( obj = vlc_internals (p_libvlc_global)->next;
- obj != VLC_OBJECT (p_libvlc_global);
+ for( obj = vlc_internals (p_anchor)->next;
+ obj != VLC_OBJECT (p_anchor);
obj = vlc_internals (obj)->next )
{
if( obj->i_object_id == i_id )
static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ libvlc_int_t *p_libvlc = p_this->p_libvlc;
+
(void)oldval; (void)p_data;
if( *psz_cmd == 'l' )
{
- vlc_object_t *root = VLC_OBJECT (vlc_global ()), *cur = root;
+ vlc_object_t *cur = VLC_OBJECT (p_libvlc);
vlc_mutex_lock( &structure_lock );
do
PrintObject (cur, "");
cur = vlc_internals (cur)->next;
}
- while (cur != root);
+ while (cur != VLC_OBJECT(p_libvlc));
vlc_mutex_unlock( &structure_lock );
}
else
{
char *end;
int i_id = strtol( newval.psz_string, &end, 0 );
- if( end != newval.psz_string )
- p_object = vlc_object_get( i_id );
+ if( !*end )
+ p_object = vlc_object_get( p_libvlc, i_id );
else
/* try using the object's name to find it */
p_object = vlc_object_find_name( p_this, newval.psz_string,
char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
if( !p_object )
- p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
+ p_object = VLC_OBJECT(p_this->p_libvlc);
psz_foo[0] = '|';
DumpStructure( p_object, 0, psz_foo );