From: RĂ©mi Denis-Courmont Date: Sat, 31 May 2008 10:29:30 +0000 (+0300) Subject: intf_Create: remove unused parameters X-Git-Tag: 0.9.0-test0~535 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=26c146e8ac44d1e23d57c1e950578768c85e4465;p=vlc intf_Create: remove unused parameters --- diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 04c7c19db6..23fa959525 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -116,8 +116,8 @@ struct intf_dialog_args_t /***************************************************************************** * Prototypes *****************************************************************************/ -#define intf_Create(a,b,c,d) __intf_Create(VLC_OBJECT(a),b,c,d) -VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char *, int, const char *const * ) ); +#define intf_Create(a,b) __intf_Create(VLC_OBJECT(a),b) +VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char * ) ); VLC_EXPORT( int, intf_RunThread, ( intf_thread_t * ) ); VLC_EXPORT( void, intf_StopThread, ( intf_thread_t * ) ); diff --git a/modules/codec/cmml/cmml.c b/modules/codec/cmml/cmml.c index ef66d4a821..0f6ae97a28 100644 --- a/modules/codec/cmml/cmml.c +++ b/modules/codec/cmml/cmml.c @@ -131,7 +131,7 @@ static int OpenDecoder( vlc_object_t *p_this ) vlc_object_release( p_input ); /* initialise the CMML responder interface */ - p_sys->p_intf = intf_Create( p_dec, "cmml", 0, NULL ); + p_sys->p_intf = intf_Create( p_dec, "cmml" ); intf_RunThread( p_sys->p_intf ); return VLC_SUCCESS; diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c index 7eed573b3a..6a6c10e88f 100644 --- a/modules/control/ntservice.c +++ b/modules/control/ntservice.c @@ -319,7 +319,7 @@ static void WINAPI ServiceDispatch( DWORD numArgs, char **args ) sprintf( psz_temp, "%s,none", psz_module ); /* Try to create the interface */ - p_new_intf = intf_Create( p_intf, psz_temp, 0, NULL ); + p_new_intf = intf_Create( p_intf, psz_temp ); if( p_new_intf == NULL ) { msg_Err( p_intf, "interface \"%s\" initialization failed", diff --git a/modules/control/rc.c b/modules/control/rc.c index 05aa08a37f..b16130b22b 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -1537,7 +1537,7 @@ static int Intf( vlc_object_t *p_this, char const *psz_cmd, VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); intf_thread_t *p_newintf = NULL; - p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string, 0, NULL ); + p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string ); if( p_newintf ) { if( intf_RunThread( p_newintf ) ) diff --git a/src/interface/interface.c b/src/interface/interface.c index c4d75f18e1..24a25c34d0 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -80,16 +80,12 @@ static void intf_Destroy( vlc_object_t *obj ) *****************************************************************************/ /** * Create the interface, and prepare it for main loop. - * You can give some additional options to be used for interface initialization * * \param p_this the calling vlc_object_t * \param psz_module a preferred interface module - * \param i_options number additional options - * \param ppsz_options additional option strings * \return a pointer to the created interface thread, NULL on error */ -intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module, - int i_options, const char *const *ppsz_options ) +intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module ) { intf_thread_t * p_intf; int i; @@ -108,9 +104,6 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module, p_intf->b_interaction = false; p_intf->b_should_run_on_first_thread = false; - for( i = 0 ; i< i_options; i++ ) - var_OptionParse( p_this, ppsz_options[i], true ); - /* Choose the best module */ p_intf->psz_intf = strdup( psz_module ); p_intf->p_module = module_Need( p_intf, "interface", psz_module, false ); @@ -264,7 +257,7 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, /* Try to create the interface */ sprintf( psz_intf, "%s,none", newval.psz_string ); - p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL ); + p_intf = intf_Create( p_this->p_libvlc, psz_intf ); free( psz_intf ); if( p_intf == NULL ) { diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 47b0302569..24d2290f87 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -1131,7 +1131,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module, } /* Try to create the interface */ - p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf", 0, NULL ); + p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ); if( p_intf == NULL ) { msg_Err( p_libvlc, "interface \"%s\" initialization failed",