VLC_EXPORT( void, __vlc_object_destroy, ( vlc_object_t * ) );
VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
-VLC_EXPORT( void *, __vlc_object_get, ( vlc_object_t *, int ) );
+VLC_EXPORT( void *, vlc_object_get, ( 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 * ) );
#define vlc_object_attach(a,b) \
__vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) )
-#define vlc_object_get(a,b) \
- __vlc_object_get( VLC_OBJECT(a),b)
-
#define vlc_object_find(a,b,c) \
__vlc_object_find( VLC_OBJECT(a),b,c)
module_t * p_module = NULL;
if( fType == TYPE_MODULE )
{
- p_module = (module_t *) vlc_object_get( p_intf, fObjectId );
+ p_module = (module_t *) vlc_object_get( fObjectId );
}
else
{
vlc_thread_set_priority( VLCIntf , VLC_THREAD_PRIORITY_LOW );
- p_object = (vlc_object_t *)vlc_object_get( VLCIntf,
- [o_data objectID] );
+ p_object = (vlc_object_t *)vlc_object_get( [o_data objectID] );
if( p_object != NULL )
{
/* Get a pointer to the module */
if( i_object_category == -1 )
{
- p_parser = (module_t *) vlc_object_get( p_intf, i_object_id );
+ p_parser = (module_t *) vlc_object_get( i_object_id );
if( !p_parser || ((vlc_object_t*)p_parser)->i_object_type != VLC_OBJECT_MODULE )
{
/* 0OOoo something went really bad */
// Add static entries to menus
void addDPStaticEntry( QMenu *menu,
const QString text,
- char *help,
- char *icon,
+ const char *help,
+ const char *icon,
const char *member,
- char *shortcut )
+ const char *shortcut )
{
if( !EMPTY_STR( icon ) > 0 )
{
void addMIMStaticEntry( intf_thread_t *p_intf,
QMenu *menu,
const QString text,
- char *help,
- char *icon,
+ const char *help,
+ const char *icon,
const char *member )
{
if( strlen( icon ) > 0 )
continue;
}
- p_object = ( vlc_object_t * )vlc_object_get( p_intf, objects[i] );
+ p_object = ( vlc_object_t * )vlc_object_get( objects[i] );
if( p_object == NULL ) continue;
b_section_empty = VLC_FALSE;
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( p_intf,
- itemData->i_object_id );
+ vlc_object_t *p_object = ( vlc_object_t * )vlc_object_get( 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( p_intf, pi_objects[i] );
+ p_object = (vlc_object_t *)vlc_object_get( pi_objects[i] );
if( p_object == NULL ) continue;
b_section_empty = VLC_FALSE;
if( p_menuitemext )
{
vlc_object_t *p_object = (vlc_object_t *)
- vlc_object_get( p_intf, p_menuitemext->i_object_id );
+ vlc_object_get( p_menuitemext->i_object_id );
if( p_object == NULL ) return;
var_Set( p_object, p_menuitemext->psz_var, p_menuitemext->val );
else
{
/* Get a pointer to the module */
- p_module = (module_t *)vlc_object_get( p_intf, i_object_id );
+ p_module = (module_t *)vlc_object_get( i_object_id );
if( p_module->i_object_type != VLC_OBJECT_MODULE )
{
/* 0OOoo something went really bad */
if( config_data->i_type == TYPE_MODULE )
{
p_module = (module_t *)
- vlc_object_get( p_intf, config_data->i_object_id );
+ vlc_object_get( config_data->i_object_id );
}
else
{
continue;
}
- p_object = (vlc_object_t *)vlc_object_get( p_intf,
- rai_objects[i] );
+ p_object = (vlc_object_t *)vlc_object_get( rai_objects[i] );
if( p_object == NULL ) continue;
b_section_empty = VLC_FALSE;
wxMenuItemExt *p_menuitemext = (wxMenuItemExt *)p_menuitem;
vlc_object_t *p_object;
- p_object = (vlc_object_t *)vlc_object_get( p_intf,
- p_menuitemext->i_object_id );
+ p_object = (vlc_object_t *)vlc_object_get( p_menuitemext->i_object_id );
if( p_object == NULL ) return;
wxMutexGuiLeave(); // We don't want deadlocks
for( i = MAXLOOK * i_level; i--; )
{
int id = (int) (MAXOBJ * i_level * 1.0 * rand() / (RAND_MAX));
- vlc_object_get( p_this, pp_objects[id]->i_object_id );
+ vlc_object_get( pp_objects[id]->i_object_id );
vlc_object_release( p_this );
}
if( !p_mi || p_mi->i_input_id == -1 )
return;
- p_input_thread = (input_thread_t*)vlc_object_get(
- p_mi->p_libvlc_instance->p_libvlc_int,
- p_mi->i_input_id );
+ p_input_thread = (input_thread_t*)vlc_object_get( p_mi->i_input_id );
p_mi->i_input_id = -1;
RAISENULL( "Input is NULL" );
}
- p_input_thread = (input_thread_t*)vlc_object_get(
- p_mi->p_libvlc_instance->p_libvlc_int,
- p_mi->i_input_id );
+ p_input_thread = (input_thread_t*)vlc_object_get( p_mi->i_input_id );
if( !p_input_thread )
{
vlc_mutex_unlock( &p_mi->object_lock );
vlc_value_t oldval, vlc_value_t newval,
void * p_userdata )
{
+ VLC_UNUSED(oldval);
libvlc_media_instance_t * p_mi = p_userdata;
libvlc_event_t event;
libvlc_event_type_t type = newval.i_int;
vlc_value_t oldval, vlc_value_t newval,
void * p_userdata )
{
+ VLC_UNUSED(oldval);
libvlc_media_instance_t * p_mi = p_userdata;
vlc_value_t val;
vlc_value_t oldval, vlc_value_t newval,
void * p_userdata )
{
+ VLC_UNUSED(oldval);
libvlc_media_instance_t * p_mi = p_userdata;
vlc_value_t val;
p_mi->p_md->p_input_item, VLC_FALSE );
/* Released in _release() */
- p_input_thread = (input_thread_t*)vlc_object_get( p_mi->p_libvlc_instance->p_libvlc_int,
- p_mi->i_input_id );
+ p_input_thread = (input_thread_t*)vlc_object_get( p_mi->i_input_id );
if( !p_input_thread )
{
var_SetInteger( p_vout, "snapshot-width", i_width );
var_SetInteger( p_vout, "snapshot-height", i_height );
- p_input_thread = (input_thread_t*)vlc_object_get(
- p_mi->p_libvlc_instance->p_libvlc_int,
- p_mi->i_input_id );
+ p_input_thread = (input_thread_t*)vlc_object_get( p_mi->i_input_id );
if( !p_input_thread )
{
libvlc_exception_raise( p_e, "Input does not exist" );
libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
{
+ VLC_UNUSED(p_e);
+
libvlc_drawable_t result;
result = var_GetInteger( p_instance->p_libvlc_int, "drawable" );
__vlc_object_detach
__vlc_object_find
__vlc_object_find_name
-__vlc_object_get
+vlc_object_get
__vlc_object_kill
__vlc_object_lock
__vlc_object_release
* This function looks for the object whose i_object_id field is i_id. We
* use a dichotomy so that lookups are in log2(n).
*****************************************************************************/
-void * __vlc_object_get( vlc_object_t *p_this, int i_id )
+void * vlc_object_get( int i_id )
{
int i_max, i_middle;
vlc_object_t **pp_objects;
char *end;
int i_id = strtol( newval.psz_string, &end, 0 );
if( end != newval.psz_string )
- p_object = vlc_object_get( p_this, i_id );
+ p_object = vlc_object_get( i_id );
else
{
/* try using the object's name to find it */
- vlc_object_t *p_libvlc = vlc_object_get( p_this, 1 );
+ vlc_object_t *p_libvlc = vlc_object_get( 1 );
if( p_libvlc )
{
/* Look in p_libvlc's children tree */