From b941c1e48ddf3de05bde370ab6495f4580587dda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Mon, 28 Jan 2008 16:14:16 +0000 Subject: [PATCH] vlc_object_get(): removes unused parameter --- include/vlc_objects.h | 5 +---- modules/gui/beos/PreferencesWindow.cpp | 2 +- modules/gui/macosx/controls.m | 3 +-- modules/gui/macosx/prefs.m | 2 +- modules/gui/qt4/menus.cpp | 15 +++++++-------- modules/gui/wince/menus.cpp | 4 ++-- modules/gui/wince/preferences.cpp | 2 +- modules/gui/wxwidgets/dialogs/preferences.cpp | 2 +- modules/gui/wxwidgets/menus.cpp | 6 ++---- modules/misc/testsuite/test4.c | 2 +- src/control/media_instance.c | 14 ++++++-------- src/control/video.c | 6 +++--- src/libvlc.sym | 2 +- src/misc/objects.c | 6 +++--- 14 files changed, 31 insertions(+), 40 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 5048fdb44c..9d92472488 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -98,7 +98,7 @@ VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) ); 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 * ) ); @@ -121,9 +121,6 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_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) diff --git a/modules/gui/beos/PreferencesWindow.cpp b/modules/gui/beos/PreferencesWindow.cpp index 6cc0164fe3..2d780294b6 100644 --- a/modules/gui/beos/PreferencesWindow.cpp +++ b/modules/gui/beos/PreferencesWindow.cpp @@ -425,7 +425,7 @@ ConfigItem::ConfigItem( intf_thread_t * _p_intf, char * name, 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 { diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 31f2c4d3f9..7a8d41b8af 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -786,8 +786,7 @@ 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 ) { diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index e496ebd001..ba9618ff7f 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -550,7 +550,7 @@ static VLCTreeItem *o_root_item = nil; /* 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 */ diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index b59948ec89..abbbb17c41 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -54,10 +54,10 @@ static QActionGroup *currentGroup; // 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 ) { @@ -78,8 +78,8 @@ void addDPStaticEntry( QMenu *menu, 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 ) @@ -775,7 +775,7 @@ QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, 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; @@ -1046,8 +1046,7 @@ void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var, void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data ) { MenuItemData *itemData = qobject_cast( 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 ); diff --git a/modules/gui/wince/menus.cpp b/modules/gui/wince/menus.cpp index ce27d95240..3de127c714 100644 --- a/modules/gui/wince/menus.cpp +++ b/modules/gui/wince/menus.cpp @@ -493,7 +493,7 @@ void RefreshMenu( intf_thread_t *p_intf, vector *p_menu_list, 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; @@ -764,7 +764,7 @@ void OnMenuEvent( intf_thread_t *p_intf, int id ) 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 ); diff --git a/modules/gui/wince/preferences.cpp b/modules/gui/wince/preferences.cpp index d0bfa02a43..1193418a03 100644 --- a/modules/gui/wince/preferences.cpp +++ b/modules/gui/wince/preferences.cpp @@ -705,7 +705,7 @@ PrefsPanel::PrefsPanel( HWND parent, HINSTANCE hInst, intf_thread_t *_p_intf, 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 */ diff --git a/modules/gui/wxwidgets/dialogs/preferences.cpp b/modules/gui/wxwidgets/dialogs/preferences.cpp index fa661da671..8dbbda7823 100644 --- a/modules/gui/wxwidgets/dialogs/preferences.cpp +++ b/modules/gui/wxwidgets/dialogs/preferences.cpp @@ -900,7 +900,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf, 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 { diff --git a/modules/gui/wxwidgets/menus.cpp b/modules/gui/wxwidgets/menus.cpp index 0f6513fcf0..2118c92f16 100644 --- a/modules/gui/wxwidgets/menus.cpp +++ b/modules/gui/wxwidgets/menus.cpp @@ -591,8 +591,7 @@ void Menu::Populate( ArrayOfStrings & ras_varnames, 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; @@ -1026,8 +1025,7 @@ void MenuEvtHandler::OnMenuEvent( wxCommandEvent& event ) 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 diff --git a/modules/misc/testsuite/test4.c b/modules/misc/testsuite/test4.c index b3ca9d0d64..bfad7400b2 100644 --- a/modules/misc/testsuite/test4.c +++ b/modules/misc/testsuite/test4.c @@ -306,7 +306,7 @@ static int Stress( vlc_object_t *p_this, char const *psz_cmd, 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 ); } diff --git a/src/control/media_instance.c b/src/control/media_instance.c index 8ac0d95679..451265d1a3 100644 --- a/src/control/media_instance.c +++ b/src/control/media_instance.c @@ -71,9 +71,7 @@ static void release_input_thread( libvlc_media_instance_t *p_mi ) 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; @@ -128,9 +126,7 @@ input_thread_t *libvlc_get_input_thread( libvlc_media_instance_t *p_mi, 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 ); @@ -149,6 +145,7 @@ input_state_changed( vlc_object_t * p_this, char const * psz_cmd, 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; @@ -190,6 +187,7 @@ input_position_changed( vlc_object_t * p_this, char const * psz_cmd, 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; @@ -222,6 +220,7 @@ input_time_changed( vlc_object_t * p_this, char const * psz_cmd, 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; @@ -540,8 +539,7 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, 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 ) { diff --git a/src/control/video.c b/src/control/video.c index e9aea7ac0c..4ba2d3d032 100644 --- a/src/control/video.c +++ b/src/control/video.c @@ -147,9 +147,7 @@ libvlc_video_take_snapshot( libvlc_media_instance_t *p_mi, char *psz_filepath, 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" ); @@ -278,6 +276,8 @@ void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d 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" ); diff --git a/src/libvlc.sym b/src/libvlc.sym index a2c520d9a3..d5c532ddc0 100644 --- a/src/libvlc.sym +++ b/src/libvlc.sym @@ -416,7 +416,7 @@ __vlc_object_destroy __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 diff --git a/src/misc/objects.c b/src/misc/objects.c index dc2a7bd9ab..0395161d8e 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -708,7 +708,7 @@ void __vlc_object_kill( vlc_object_t *p_this ) * 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; @@ -1074,11 +1074,11 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, 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 */ -- 2.39.2