Remove --save-config

This commit is contained in:
Rémi Denis-Courmont 2010-01-17 22:28:40 +02:00
parent 57fc7b4e8b
commit e49c415925
3 changed files with 2 additions and 12 deletions

1
NEWS
View File

@ -93,6 +93,7 @@ Maemo port:
Misc:
* new sqlite module
* --save-config command line option not supported anymore.
Removed modules:
* csri codec. Use libass module instead.

View File

@ -2738,8 +2738,6 @@ vlc_module_begin ()
"matches.")
#define IGNORE_CONFIG_TEXT \
N_("no configuration option will be loaded nor saved to config file")
#define SAVE_CONFIG_TEXT \
N_("save the current command line options in the config")
#define RESET_CONFIG_TEXT \
N_("reset the current config to the default values")
#define CONFIG_TEXT \
@ -2779,10 +2777,7 @@ vlc_module_begin ()
add_bool( "ignore-config", true, NULL, IGNORE_CONFIG_TEXT, "", false )
change_internal ()
change_unsaveable ()
add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "",
false )
change_internal ()
change_unsaveable ()
add_obsolete_bool( "save-config" )
add_bool( "reset-config", false, NULL, RESET_CONFIG_TEXT, "", false )
change_internal ()
change_unsaveable ()

View File

@ -520,12 +520,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
config_SaveConfigFile( p_libvlc, NULL );
}
if( var_InheritBool( p_libvlc, "save-config" ) )
{
config_LoadConfigFile( p_libvlc, NULL );
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
config_SaveConfigFile( p_libvlc, NULL );
}
}
if( module_count <= 1)