Commit 3ab81753 authored by Rafaël Carré's avatar Rafaël Carré

remove buggy and inconsistent intf-switch

if you need skins, use skins.
if you need skins and something else, use both.
parent e43ea251
......@@ -516,13 +516,3 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
break;
}
}
void DialogsProvider::switchToSkins()
{
var_SetString( p_intf, "intf-switch", "skins2" );
}
void DialogsProvider::switchToWx()
{
var_SetString( p_intf, "intf-switch", "wxwidgets" );
}
......@@ -187,8 +187,6 @@ public slots:
void openAPlaylist();
void saveAPlaylist();
void switchToSkins();
void switchToWx();
void quit();
};
......
......@@ -332,20 +332,6 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
QMenu *menu = Populate( p_intf, current, varnames, objects );
if( !p_intf->pf_show_dialog )
{
menu->addSeparator();
menu->addAction( qtr( "Switch to skins" ), THEDP,
SLOT( switchToSkins() ), QString( "Ctrl+Z" ) );
#ifdef HAVE_WX
if( module_Exists( VLC_OBJECT( p_intf ), "wxwidgets" ) )
{
menu->addAction( qtr( "Switch to WxWidgets" ), THEDP,
SLOT( switchToWx() ) );
}
#endif
}
CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
THEDP->menusUpdateMapper->setMapping( menu, 4 );
return menu;
......@@ -817,8 +803,6 @@ static bool IsMenuEmpty( const char *psz_var,
if( ( i_type & VLC_VAR_TYPE ) != VLC_VAR_VARIABLE )
{
/* Very evil hack ! intf-switch can have only one value */
if( !strcmp( psz_var, "intf-switch" ) ) return false;
if( val.i_int == 1 && b_root ) return true;
else return false;
}
......
......@@ -443,8 +443,6 @@ void RefreshSettingsMenu( intf_thread_t *p_intf, HMENU hMenu )
vlc_object_find( p_intf, VLC_OBJECT_INTF, FIND_PARENT );
if( p_object != NULL )
{
ppsz_varnames[i] = "intf-switch";
pi_objects[i++] = p_object->i_object_id;
ppsz_varnames[i] = "intf-add";
pi_objects[i++] = p_object->i_object_id;
vlc_object_release( p_object );
......
......@@ -206,16 +206,6 @@ int IntfAutoMenuBuilder( intf_thread_t *p_intf, ArrayOfInts &ri_objects,
FIND_PARENT );
if( p_object != NULL )
{
if( is_popup )
{
#ifndef WIN32
PUSH_VAR( "intf-switch" );
#endif
}
else
{
PUSH_VAR( "intf-switch" );
}
PUSH_VAR( "intf-add" );
PUSH_VAR( "intf-skins" );
vlc_object_release( p_object );
......@@ -527,7 +517,6 @@ wxMenu *SettingsMenu( intf_thread_t *_p_intf, wxWindow *p_parent,
FIND_PARENT );
if( p_object != NULL )
{
PUSH_VAR( "intf-switch" );
PUSH_VAR( "intf-add" );
vlc_object_release( p_object );
}
......@@ -651,8 +640,6 @@ static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object,
if( (i_type & VLC_VAR_TYPE) != VLC_VAR_VARIABLE )
{
/* Very evil hack ! intf-switch can have only one value */
if( !strcmp( psz_var, "intf-switch" ) ) return FALSE;
if( val.i_int == 1 && b_root ) return TRUE;
else return FALSE;
}
......
......@@ -51,8 +51,6 @@
*****************************************************************************/
static void RunInterface( intf_thread_t *p_intf );
static int SwitchIntfCallback( vlc_object_t *, char const *,
vlc_value_t , vlc_value_t , void * );
static int AddIntfCallback( vlc_object_t *, char const *,
vlc_value_t , vlc_value_t , void * );
......@@ -204,49 +202,9 @@ void intf_Destroy( intf_thread_t *p_intf )
*****************************************************************************/
static void RunInterface( intf_thread_t *p_intf )
{
static const char *ppsz_interfaces[] =
{
"skins2", "Skins 2",
#ifndef WIN32
"wxwidgets", "wxWidgets",
#endif
NULL, NULL
};
const char **ppsz_parser;
vlc_list_t *p_list;
int i;
vlc_value_t val, text;
char *psz_intf;
/* Variable used for interface switching */
p_intf->psz_switch_intf = NULL;
var_Create( p_intf, "intf-switch", VLC_VAR_STRING |
VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND );
text.psz_string = _("Switch interface");
var_Change( p_intf, "intf-switch", VLC_VAR_SETTEXT, &text, NULL );
/* Only fill the list with available modules */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
for( ppsz_parser = ppsz_interfaces; *ppsz_parser; ppsz_parser += 2 )
{
for( i = 0; i < p_list->i_count; i++ )
{
module_t *p_module = (module_t *)p_list->p_values[i].p_object;
if( !strcmp( p_module->psz_object_name, ppsz_parser[0] ) )
{
val.psz_string = (char *)ppsz_parser[0];
text.psz_string = (char *)_(ppsz_parser[1]);
var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE,
&val, &text );
break;
}
}
}
vlc_list_release( p_list );
var_AddCallback( p_intf, "intf-switch", SwitchIntfCallback, NULL );
/* Variable used for interface spawning */
var_Create( p_intf, "intf-add", VLC_VAR_STRING |
VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND );
......@@ -302,20 +260,6 @@ static void RunInterface( intf_thread_t *p_intf )
while( p_intf->p_module );
}
static int SwitchIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
(void)psz_cmd; (void)oldval; (void)p_data;
p_intf->psz_switch_intf =
malloc( strlen(newval.psz_string) + sizeof(",none") );
sprintf( p_intf->psz_switch_intf, "%s,none", newval.psz_string );
vlc_object_kill( p_intf );
return VLC_SUCCESS;
}
static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment