Skip to content

V
vlc-2-2
Commit 2b6863df authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* src/misc/configuration.c, ALL: support for auto-saveable config options... 

* src/misc/configuration.c, ALL: support for auto-saveable config options (saved automatically on exit).
parent 7c16ceb6
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 20 deletions
include/configuration.h
View file @ 2b6863df
......@@ -155,6 +155,12 @@ struct module_config_t
char *psz_value_orig;
int i_value_orig;
float f_value_orig;
/* Option values loaded from config file */
char *psz_value_saved;
int i_value_saved;
float f_value_saved;
vlc_bool_t b_autosave; /* Config will be auto-saved at exit time */
};
/*****************************************************************************
......@@ -199,6 +205,7 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) );
/* internal only */
int config_CreateDir( vlc_object_t *, char * );
int config_AutoSaveConfigFile( vlc_object_t * );
/*****************************************************************************
* Macros used to build the configuration structure.
......@@ -369,3 +376,6 @@ int config_CreateDir( vlc_object_t *, char * );
p_config[i_config].ppsz_action_text[p_config[i_config].i_action] = \
action_text; \
p_config[i_config].i_action++;
#define change_autosave() \
p_config[i_config].b_autosave = VLC_TRUE;
modules/gui/skins2/src/skin_main.cpp
View file @ 2b6863df
......@@ -344,8 +344,10 @@ vlc_module_begin();
set_subcategory( SUBCAT_INTERFACE_GENERAL );
add_string( "skins2-last", "", NULL, SKINS2_LAST, SKINS2_LAST_LONG,
VLC_TRUE );
change_autosave();
add_string( "skins2-config", "", NULL, SKINS2_CONFIG, SKINS2_CONFIG_LONG,
VLC_TRUE );
change_autosave();
#ifdef WIN32
add_bool( "skins2-transparency", VLC_FALSE, NULL, SKINS2_TRANSPARENCY,
SKINS2_TRANSPARENCY_LONG, VLC_FALSE );
......
modules/gui/skins2/src/theme.cpp
View file @ 2b6863df
......@@ -110,7 +110,6 @@ void Theme::saveConfig()
// Save config to file
config_PutPsz( getIntf(), "skins2-config", save );
config_SaveConfigFile( getIntf(), "skins2" );
// Free memory
delete[] save;
......
modules/gui/wxwindows/wxwindows.cpp
View file @ 2b6863df
......@@ -131,6 +131,7 @@ vlc_module_begin();
#endif
add_string( "wxwin-config-last", NULL, NULL,
"last config", "last config", VLC_TRUE );
change_autosave();
add_submodule();
set_description( _("wxWindows dialogs provider") );
......@@ -537,7 +538,6 @@ WindowSettings::~WindowSettings( )
}
config_PutPsz( p_intf, "wxwin-config-last", sCfg.mb_str() );
config_SaveConfigFile( p_intf, "wxwindows" );
}
void WindowSettings::SetScreen( int i_screen_w, int i_screen_h )
{
......
src/misc/configuration.c
View file @ 2b6863df
......@@ -266,6 +266,8 @@ void __config_PutPsz( vlc_object_t *p_this,
if( psz_value && *psz_value ) p_config->psz_value = strdup( psz_value );
else p_config->psz_value = NULL;
p_config->b_dirty = VLC_TRUE;
val.psz_string = p_config->psz_value;
vlc_mutex_unlock( p_config->p_lock );
......@@ -329,6 +331,8 @@ void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
p_config->i_value = i_value;
}
p_config->b_dirty = VLC_TRUE;
val.i_int = p_config->i_value;
if( p_config->pf_callback )
......@@ -385,6 +389,8 @@ void __config_PutFloat( vlc_object_t *p_this,
p_config->f_value = f_value;
}
p_config->b_dirty = VLC_TRUE;
val.f_float = p_config->f_value;
if( p_config->pf_callback )
......@@ -513,6 +519,9 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig )
p_module->p_config[i].i_value_orig = p_orig[i].i_value;
p_module->p_config[i].f_value_orig = p_orig[i].f_value;
p_module->p_config[i].i_value_saved = p_orig[i].i_value;
p_module->p_config[i].f_value_saved = p_orig[i].f_value;
p_module->p_config[i].psz_value_saved = 0;
p_module->p_config[i].psz_type = p_orig[i].psz_type ?
strdup( p_orig[i].psz_type ) : NULL;
......@@ -628,6 +637,9 @@ void config_Free( module_t *p_module )
if( p_item->psz_value_orig )
free( p_item->psz_value_orig );
if( p_item->psz_value_saved )
free( p_item->psz_value_saved );
if( p_item->i_list )
{
for( i = 0; i < p_item->i_list; i++ )
......@@ -862,6 +874,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
if( !*psz_option_value )
break; /* ignore empty option */
p_item->i_value = strtol( psz_option_value, 0, 0 );
p_item->i_value_saved = p_item->i_value;
#if 0
msg_Dbg( p_this, "option \"%s\", value %i",
p_item->psz_name, p_item->i_value );
......@@ -872,7 +885,8 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
if( !*psz_option_value )
break; /* ignore empty option */
p_item->f_value = (float)atof( psz_option_value);
#if O
p_item->f_value_saved = p_item->f_value;
#if 0
msg_Dbg( p_this, "option \"%s\", value %f",
p_item->psz_name, (double)p_item->f_value );
#endif
......@@ -880,7 +894,8 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
case CONFIG_ITEM_KEY:
if( !*psz_option_value )
break; /* ignore empty option */
p_item->i_value = ConfigStringToKey( psz_option_value );
p_item->i_value = ConfigStringToKey(psz_option_value);
p_item->i_value_saved = p_item->i_value;
break;
default:
......@@ -893,6 +908,14 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
p_item->psz_value = *psz_option_value ?
strdup( psz_option_value ) : NULL;
if( p_item->psz_value_saved )
free( p_item->psz_value_saved );
p_item->psz_value_saved = 0;
if( p_item->psz_value && p_item->psz_value_orig &&
strcmp(p_item->psz_value, p_item->psz_value_orig) )
p_item->psz_value_saved = p_item->psz_value ?
strdup( p_item->psz_value ) : 0;
vlc_mutex_unlock( p_item->p_lock );
#if 0
......@@ -983,7 +1006,8 @@ int config_CreateDir( vlc_object_t *p_this, char *psz_dirname )
* save.
* Really stupid no ?
*****************************************************************************/
int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
vlc_bool_t b_autosave )
{
module_t *p_parser;
vlc_list_t *p_list;
......@@ -1152,8 +1176,9 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
if( !p_parser->i_config_items )
continue;
msg_Dbg( p_this, "saving config for module \"%s\"",
p_parser->psz_object_name );
if( psz_module_name )
msg_Dbg( p_this, "saving config for module \"%s\"",
p_parser->psz_object_name );
fprintf( file, "[%s]", p_parser->psz_object_name );
if( p_parser->psz_longname )
......@@ -1165,7 +1190,18 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
char *psz_key;
char *psz_key;
int i_value = p_item->i_value;
float f_value = p_item->f_value;
char *psz_value = p_item->psz_value;
if( b_autosave && !p_item->b_autosave )
{
i_value = p_item->i_value_saved;
f_value = p_item->f_value_saved;
psz_value = p_item->psz_value_saved;
}
if( p_item->i_type & CONFIG_HINT )
/* ignore hints */
continue;
......@@ -1178,43 +1214,57 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
(p_item->i_type == CONFIG_ITEM_BOOL) ?
_("boolean") : _("integer") );
if( p_item->i_value == p_item->i_value_orig )
if( i_value == p_item->i_value_orig )
fprintf( file, "#" );
fprintf( file, "%s=%i\n", p_item->psz_name, p_item->i_value );
fprintf( file, "%s=%i\n", p_item->psz_name, i_value );
p_item->i_value_saved = i_value;
break;
case CONFIG_ITEM_KEY:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("key") );
if( p_item->i_value == p_item->i_value_orig )
if( i_value == p_item->i_value_orig )
fprintf( file, "#" );
psz_key = ConfigKeyToString( p_item->i_value );
psz_key = ConfigKeyToString( i_value );
fprintf( file, "%s=%s\n", p_item->psz_name,
psz_key ? psz_key : "" );
if ( psz_key ) free( psz_key );
p_item->i_value_saved = i_value;
break;
case CONFIG_ITEM_FLOAT:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("float") );
if( p_item->f_value == p_item->f_value_orig )
if( f_value == p_item->f_value_orig )
fprintf( file, "#" );
fprintf( file, "%s=%f\n", p_item->psz_name,
(double)p_item->f_value );
fprintf( file, "%s=%f\n", p_item->psz_name, (double)f_value );
p_item->f_value_saved = f_value;
break;
default:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("string") );
if( (!p_item->psz_value && !p_item->psz_value_orig) ||
(p_item->psz_value && p_item->psz_value_orig &&
!strcmp( p_item->psz_value, p_item->psz_value_orig )) )
if( (!psz_value && !p_item->psz_value_orig) ||
(psz_value && p_item->psz_value_orig &&
!strcmp( psz_value, p_item->psz_value_orig )) )
fprintf( file, "#" );
fprintf( file, "%s=%s\n", p_item->psz_name,
p_item->psz_value ? p_item->psz_value : "" );
psz_value ? psz_value : "" );
if( p_item->psz_value_saved )
free( p_item->psz_value_saved );
p_item->psz_value_saved = 0;
if( psz_value && p_item->psz_value_orig &&
strcmp( psz_value, p_item->psz_value_orig ) )
p_item->psz_value_saved = psz_value ? strdup(psz_value):0;
}
p_item->b_dirty = VLC_FALSE;
}
fprintf( file, "\n" );
......@@ -1235,6 +1285,41 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
return 0;
}
int config_AutoSaveConfigFile( vlc_object_t *p_this )
{
vlc_list_t *p_list;
module_t *p_parser;
module_config_t *p_item;
int i_index = 0;
/* Check if there's anything to save */
vlc_mutex_lock( &p_this->p_vlc->config_lock );
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
p_parser = (module_t *)p_list->p_values[i_index].p_object ;
if( !p_parser->i_config_items ) continue;
for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
if( p_item->b_autosave && p_item->b_dirty ) break;
}
}
vlc_list_release( p_list );
vlc_mutex_unlock( &p_this->p_vlc->config_lock );
if( i_index == p_list->i_count ) return VLC_SUCCESS;
return SaveConfigFile( p_this, 0, VLC_TRUE );
}
int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
return SaveConfigFile( p_this, psz_module_name, VLC_FALSE );
}
/*****************************************************************************
* config_LoadCmdLine: parse command line
*****************************************************************************
......
src/misc/modules.c
View file @ 2b6863df
......@@ -245,6 +245,8 @@ void __module_EndBank( vlc_object_t *p_this )
vlc_mutex_unlock( lockval.p_address );
var_Destroy( p_this->p_libvlc, "libvlc" );
config_AutoSaveConfigFile( p_this );
#ifdef HAVE_DYNAMIC_PLUGINS
#define p_bank p_this->p_libvlc->p_module_bank
if( p_bank->b_cache ) CacheSave( p_this );
......@@ -1698,10 +1700,13 @@ static void CacheLoad( vlc_object_t *p_this )
#define LOAD_STRING(a) \
{ if( fread( &i_size, sizeof(char), sizeof(i_size), file ) \
!= sizeof(i_size) ) goto error; \
if( i_size ) { \
if( i_size && i_size > 16384 ) { \
a = malloc( i_size ); \
if( fread( a, sizeof(char), i_size, file ) != (size_t)i_size ) \
goto error; \
if( a[i_size-1] ) { \
free( a ); a = 0; \
goto error; } \
} else a = 0; \
} while(0)
......@@ -1820,6 +1825,10 @@ int CacheLoadConfig( module_t *p_module, FILE *file )
strdup( p_module->p_config[i].psz_value_orig ) : 0;
p_module->p_config[i].i_value = p_module->p_config[i].i_value_orig;
p_module->p_config[i].f_value = p_module->p_config[i].f_value_orig;
p_module->p_config[i].i_value_saved = p_module->p_config[i].i_value;
p_module->p_config[i].f_value_saved = p_module->p_config[i].f_value;
p_module->p_config[i].psz_value_saved = 0;
p_module->p_config[i].b_dirty = VLC_FALSE;
p_module->p_config[i].p_lock = &p_module->object_lock;
......
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