X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fconfiguration.c;h=441834f2635e241fb5531ecd64eff8649c207f73;hb=e53ac062b4ad2228ce69d11c481a0f0f17368159;hp=b1163474e3cb088bee93a505016a86f46eb3f5a3;hpb=77c667f4093a67cca8e77b4cb76a5fd2a674a5bf;p=vlc diff --git a/src/misc/configuration.c b/src/misc/configuration.c index b1163474e3..441834f263 100644 --- a/src/misc/configuration.c +++ b/src/misc/configuration.c @@ -2,7 +2,7 @@ * configuration.c management of the modules configuration ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: configuration.c,v 1.44 2002/11/10 23:41:53 sam Exp $ + * $Id: configuration.c,v 1.67 2003/11/05 00:39:17 gbazin Exp $ * * Authors: Gildas Bazin * @@ -22,6 +22,7 @@ *****************************************************************************/ #include +#include "vlc_keys.h" #include /* sprintf() */ #include /* free(), strtol() */ @@ -43,7 +44,7 @@ #endif #if defined(HAVE_GETPWUID) -#include /* getpwuid() */ +# include /* getpwuid() */ #endif #if defined( HAVE_SYS_STAT_H ) @@ -52,6 +53,67 @@ #if defined( HAVE_SYS_TYPES_H ) # include #endif +#if defined( WIN32 ) && !defined( UNDER_CE ) +# include +#endif + + +static int ConfigStringToKey( char * ); +static char *ConfigKeyToString( int ); + +/***************************************************************************** + * config_GetType: get the type of a variable (bool, int, float, string) + ***************************************************************************** + * This function is used to get the type of a variable from its name. + * Beware, this is quite slow. + *****************************************************************************/ +int __config_GetType( vlc_object_t *p_this, const char *psz_name ) +{ + module_config_t *p_config; + int i_type; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + return 0; + } + + switch( p_config->i_type ) + { + case CONFIG_ITEM_BOOL: + i_type = VLC_VAR_BOOL; + break; + + case CONFIG_ITEM_INTEGER: + i_type = VLC_VAR_INTEGER; + break; + + case CONFIG_ITEM_FLOAT: + i_type = VLC_VAR_FLOAT; + break; + + case CONFIG_ITEM_MODULE: + case CONFIG_ITEM_STRING: + i_type = VLC_VAR_STRING; + break; + + case CONFIG_ITEM_FILE: + i_type = VLC_VAR_FILE; + break; + + case CONFIG_ITEM_DIRECTORY: + i_type = VLC_VAR_DIRECTORY; + break; + + default: + i_type = 0; + break; + } + + return i_type; +} /***************************************************************************** * config_GetInt: get the value of an int variable @@ -73,6 +135,7 @@ int __config_GetInt( vlc_object_t *p_this, const char *psz_name ) return -1; } if( (p_config->i_type!=CONFIG_ITEM_INTEGER) && + (p_config->i_type!=CONFIG_ITEM_KEY) && (p_config->i_type!=CONFIG_ITEM_BOOL) ) { msg_Err( p_this, "option %s does not refer to an int", psz_name ); @@ -114,7 +177,7 @@ float __config_GetFloat( vlc_object_t *p_this, const char *psz_name ) ***************************************************************************** * This function is used to get the value of variables which are internally * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, - * and CONFIG_ITEM_MODULE). + * CONFIG_ITEM_DIRECTORY, and CONFIG_ITEM_MODULE). * * Important note: remember to free() the returned char* because it's a * duplicate of the actual value. It isn't safe to return a pointer to the @@ -135,6 +198,7 @@ char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name ) } if( (p_config->i_type!=CONFIG_ITEM_STRING) && (p_config->i_type!=CONFIG_ITEM_FILE) && + (p_config->i_type!=CONFIG_ITEM_DIRECTORY) && (p_config->i_type!=CONFIG_ITEM_MODULE) ) { msg_Err( p_this, "option %s does not refer to a string", psz_name ); @@ -154,23 +218,25 @@ char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name ) ***************************************************************************** * This function is used to set the value of variables which are internally * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, - * and CONFIG_ITEM_MODULE). + * CONFIG_ITEM_DIRECTORY, and CONFIG_ITEM_MODULE). *****************************************************************************/ -void __config_PutPsz( vlc_object_t *p_this, +void __config_PutPsz( vlc_object_t *p_this, const char *psz_name, const char *psz_value ) { module_config_t *p_config; + vlc_value_t oldval, val; p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - msg_Err( p_this, "option %s does not exist", psz_name ); + msg_Warn( p_this, "option %s does not exist", psz_name ); return; } if( (p_config->i_type!=CONFIG_ITEM_STRING) && (p_config->i_type!=CONFIG_ITEM_FILE) && + (p_config->i_type!=CONFIG_ITEM_DIRECTORY) && (p_config->i_type!=CONFIG_ITEM_MODULE) ) { msg_Err( p_this, "option %s does not refer to a string", psz_name ); @@ -179,18 +245,24 @@ void __config_PutPsz( vlc_object_t *p_this, vlc_mutex_lock( p_config->p_lock ); - /* free old string */ - if( p_config->psz_value ) free( p_config->psz_value ); + /* backup old value */ + oldval.psz_string = p_config->psz_value; - if( psz_value ) p_config->psz_value = strdup( psz_value ); + if( psz_value && *psz_value ) p_config->psz_value = strdup( psz_value ); else p_config->psz_value = NULL; + val.psz_string = p_config->psz_value; + vlc_mutex_unlock( p_config->p_lock ); if( p_config->pf_callback ) { - p_config->pf_callback( p_this ); + p_config->pf_callback( p_this, psz_name, oldval, val, + p_config->p_callback_data ); } + + /* free old string */ + if( oldval.psz_string ) free( oldval.psz_string ); } /***************************************************************************** @@ -203,27 +275,51 @@ void __config_PutPsz( vlc_object_t *p_this, void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) { module_config_t *p_config; + vlc_value_t oldval, val; p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - msg_Err( p_this, "option %s does not exist", psz_name ); + msg_Warn( p_this, "option %s does not exist", psz_name ); return; } if( (p_config->i_type!=CONFIG_ITEM_INTEGER) && + (p_config->i_type!=CONFIG_ITEM_KEY) && (p_config->i_type!=CONFIG_ITEM_BOOL) ) { msg_Err( p_this, "option %s does not refer to an int", psz_name ); return; } - p_config->i_value = i_value; + /* backup old value */ + oldval.i_int = p_config->i_value; + + /* if i_min == i_max == 0, then do not use them */ + if ((p_config->i_min == 0) && (p_config->i_max == 0)) + { + p_config->i_value = i_value; + } + else if (i_value < p_config->i_min) + { + p_config->i_value = p_config->i_min; + } + else if (i_value > p_config->i_max) + { + p_config->i_value = p_config->i_max; + } + else + { + p_config->i_value = i_value; + } + + val.i_int = p_config->i_value; if( p_config->pf_callback ) { - p_config->pf_callback( p_this ); + p_config->pf_callback( p_this, psz_name, oldval, val, + p_config->p_callback_data ); } } @@ -237,13 +333,14 @@ void __config_PutFloat( vlc_object_t *p_this, const char *psz_name, float f_value ) { module_config_t *p_config; + vlc_value_t oldval, val; p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - msg_Err( p_this, "option %s does not exist", psz_name ); + msg_Warn( p_this, "option %s does not exist", psz_name ); return; } if( p_config->i_type != CONFIG_ITEM_FLOAT ) @@ -252,11 +349,33 @@ void __config_PutFloat( vlc_object_t *p_this, return; } - p_config->f_value = f_value; + /* backup old value */ + oldval.f_float = p_config->f_value; + + /* if f_min == f_max == 0, then do not use them */ + if ((p_config->f_min == 0) && (p_config->f_max == 0)) + { + p_config->f_value = f_value; + } + else if (f_value < p_config->f_min) + { + p_config->f_value = p_config->f_min; + } + else if (f_value > p_config->f_max) + { + p_config->f_value = p_config->f_max; + } + else + { + p_config->f_value = f_value; + } + + val.f_float = p_config->f_value; if( p_config->pf_callback ) { - p_config->pf_callback( p_this ); + p_config->pf_callback( p_this, psz_name, oldval, val, + p_config->p_callback_data ); } } @@ -268,22 +387,23 @@ void __config_PutFloat( vlc_object_t *p_this, *****************************************************************************/ module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) { - vlc_list_t *p_list; - module_t **pp_parser; + vlc_list_t *p_list; + module_t *p_parser; module_config_t *p_item; + int i_index; if( !psz_name ) return NULL; p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - for( pp_parser = (module_t **)p_list->pp_objects ; - *pp_parser ; - pp_parser++ ) + for( i_index = 0; i_index < p_list->i_count; i_index++ ) { - if( !(*pp_parser)->i_config_items ) + p_parser = (module_t *)p_list->p_values[i_index].p_object ; + + if( !p_parser->i_config_items ) continue; - for( p_item = (*pp_parser)->p_config; + for( p_item = p_parser->p_config; p_item->i_type != CONFIG_HINT_END; p_item++ ) { @@ -303,6 +423,34 @@ module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) return NULL; } +/***************************************************************************** + * config_FindModule: find a specific module structure. + *****************************************************************************/ +module_t *config_FindModule( vlc_object_t *p_this, const char *psz_name ) +{ + vlc_list_t *p_list; + module_t *p_module, *p_result = NULL; + int i_index; + + if( !psz_name ) return NULL; + + 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_module = (module_t *)p_list->p_values[i_index].p_object; + if( !strcmp( p_module->psz_object_name, psz_name ) ) + { + p_result = p_module; + break; + } + } + + vlc_list_release( p_list ); + + return p_result; +} + /***************************************************************************** * config_Duplicate: creates a duplicate of a module's configuration data. ***************************************************************************** @@ -346,38 +494,61 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig ) /* Do the duplication job */ for( i = 0; i < i_lines ; i++ ) { - p_module->p_config[i].i_type = p_orig[i].i_type; - p_module->p_config[i].i_short = p_orig[i].i_short; - p_module->p_config[i].i_value = p_orig[i].i_value; - p_module->p_config[i].f_value = p_orig[i].f_value; - p_module->p_config[i].b_dirty = p_orig[i].b_dirty; + p_module->p_config[i] = p_orig[i]; p_module->p_config[i].psz_type = p_orig[i].psz_type ? - strdup( _(p_orig[i].psz_type) ) : NULL; + strdup( p_orig[i].psz_type ) : NULL; p_module->p_config[i].psz_name = p_orig[i].psz_name ? - strdup( _(p_orig[i].psz_name) ) : NULL; + strdup( p_orig[i].psz_name ) : NULL; p_module->p_config[i].psz_text = p_orig[i].psz_text ? strdup( _(p_orig[i].psz_text) ) : NULL; p_module->p_config[i].psz_longtext = p_orig[i].psz_longtext ? strdup( _(p_orig[i].psz_longtext) ) : NULL; p_module->p_config[i].psz_value = p_orig[i].psz_value ? strdup( p_orig[i].psz_value ) : NULL; + p_module->p_config[i].psz_value_orig = p_orig[i].psz_value ? + strdup( p_orig[i].psz_value ) : NULL; p_module->p_config[i].p_lock = &p_module->object_lock; /* duplicate the string list */ - p_module->p_config[i].ppsz_list = NULL; - if( p_orig[i].ppsz_list ) + if( p_orig[i].i_list ) { - for( j = 0; p_orig[i].ppsz_list[j]; j++ ); - p_module->p_config[i].ppsz_list = malloc( (j+1) *sizeof(char *) ); - if( p_module->p_config[i].ppsz_list ) + if( p_orig[i].ppsz_list ) { - for( j = 0; p_orig[i].ppsz_list[j]; j++ ) - p_module->p_config[i].ppsz_list[j] = - strdup( p_orig[i].ppsz_list[j] ); + p_module->p_config[i].ppsz_list = + malloc( (p_orig[i].i_list + 1) * sizeof(char *) ); + if( p_module->p_config[i].ppsz_list ) + { + for( j = 0; j < p_orig[i].i_list; j++ ) + p_module->p_config[i].ppsz_list[j] = + strdup( p_orig[i].ppsz_list[j] ); + p_module->p_config[i].ppsz_list[j] = NULL; + } + } + if( p_orig[i].ppsz_list_text ) + { + p_module->p_config[i].ppsz_list_text = + malloc( (p_orig[i].i_list + 1) * sizeof(char *) ); + if( p_module->p_config[i].ppsz_list_text ) + { + for( j = 0; j < p_orig[i].i_list; j++ ) + p_module->p_config[i].ppsz_list_text[j] = + strdup( _(p_orig[i].ppsz_list_text[j]) ); + p_module->p_config[i].ppsz_list_text[j] = NULL; + } + } + if( p_orig[i].pi_list ) + { + p_module->p_config[i].pi_list = + malloc( (p_orig[i].i_list + 1) * sizeof(int) ); + if( p_module->p_config[i].pi_list ) + { + for( j = 0; j < p_orig[i].i_list; j++ ) + p_module->p_config[i].pi_list[j] = + p_orig[i].pi_list[j]; + } } - p_module->p_config[i].ppsz_list[j] = NULL; } p_module->p_config[i].pf_callback = p_orig[i].pf_callback; @@ -416,12 +587,22 @@ void config_Free( module_t *p_module ) if( p_item->psz_value ) free( p_item->psz_value ); - if( p_item->ppsz_list ) - { - for( i = 0; p_item->ppsz_list[i]; i++ ) - free(p_item->ppsz_list[i]); - free( p_item->ppsz_list ); - } + if( p_item->psz_value_orig ) + free( p_item->psz_value_orig ); + + if( p_item->i_list ) + { + for( i = 0; i < p_item->i_list; i++ ) + { + if( p_item->ppsz_list && p_item->ppsz_list[i] ) + free( p_item->ppsz_list[i] ); + if( p_item->ppsz_list_text && p_item->ppsz_list_text[i] ) + free( p_item->ppsz_list_text[i] ); + } + if( p_item->ppsz_list ) free( p_item->ppsz_list ); + if( p_item->ppsz_list_text ) free( p_item->ppsz_list_text ); + if( p_item->pi_list ) free( p_item->pi_list ); + } } free( p_module->p_config ); @@ -459,6 +640,41 @@ void config_UnsetCallbacks( module_config_t *p_new ) } } +/***************************************************************************** + * config_ResetAll: reset the configuration data for all the modules. + *****************************************************************************/ +void __config_ResetAll( vlc_object_t *p_this ) +{ + int i_index, i; + vlc_list_t *p_list; + module_t *p_module; + + /* Acquire config file lock */ + 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_module = (module_t *)p_list->p_values[i_index].p_object ; + if( p_module->b_submodule ) continue; + + for( i = 0; p_module->p_config[i].i_type != CONFIG_HINT_END; i++ ) + { + 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; + if( p_module->p_config[i].psz_value ) + free( p_module->p_config[i].psz_value ); + p_module->p_config[i].psz_value = + p_module->p_config[i].psz_value_orig ? + strdup( p_module->p_config[i].psz_value_orig ) : NULL; + } + } + + vlc_list_release( p_list ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); +} + /***************************************************************************** * config_LoadConfigFile: loads the configuration file. ***************************************************************************** @@ -467,28 +683,40 @@ void config_UnsetCallbacks( module_config_t *p_new ) *****************************************************************************/ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) { - vlc_list_t *p_list; - module_t **pp_parser; + vlc_list_t *p_list; + module_t *p_parser; module_config_t *p_item; FILE *file; char line[1024]; char *p_index, *psz_option_name, *psz_option_value; - char *psz_filename, *psz_homedir; + char *psz_filename, *psz_homedir, *psz_configfile; + int i_index; - psz_homedir = p_this->p_vlc->psz_homedir; - if( !psz_homedir ) + psz_configfile = p_this->p_vlc->psz_configfile; + if( !psz_configfile || !psz_configfile ) { - msg_Err( p_this, "psz_homedir is null" ); - return -1; + psz_homedir = p_this->p_vlc->psz_homedir; + if( !psz_homedir ) + { + msg_Err( p_this, "psz_homedir is null" ); + return -1; + } + psz_filename = (char *)malloc( sizeof("/" CONFIG_DIR "/" CONFIG_FILE) + + strlen(psz_homedir) ); + if( psz_filename ) + sprintf( psz_filename, "%s/" CONFIG_DIR "/" CONFIG_FILE, + psz_homedir ); + } + else + { + psz_filename = strdup( psz_configfile ); } - psz_filename = (char *)malloc( strlen("/" CONFIG_DIR "/" CONFIG_FILE) + - strlen(psz_homedir) + 1 ); + if( !psz_filename ) { msg_Err( p_this, "out of memory" ); return -1; } - sprintf( psz_filename, "%s/" CONFIG_DIR "/" CONFIG_FILE, psz_homedir ); msg_Dbg( p_this, "opening config file %s", psz_filename ); @@ -507,13 +735,12 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) /* Look for the selected module, if NULL then save everything */ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - for( pp_parser = (module_t **)p_list->pp_objects ; - *pp_parser ; - pp_parser++ ) + 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( psz_module_name - && strcmp( psz_module_name, (*pp_parser)->psz_object_name ) ) + && strcmp( psz_module_name, p_parser->psz_object_name ) ) { continue; } @@ -525,13 +752,14 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) { if( (line[0] == '[') && (p_index = strchr(line,']')) - && (p_index - &line[1] == strlen((*pp_parser)->psz_object_name)) - && !memcmp( &line[1], (*pp_parser)->psz_object_name, - strlen((*pp_parser)->psz_object_name) ) ) + && (p_index - &line[1] + == (int)strlen(p_parser->psz_object_name)) + && !memcmp( &line[1], p_parser->psz_object_name, + strlen(p_parser->psz_object_name) ) ) { #if 0 msg_Dbg( p_this, "loading config for module \"%s\"", - (*pp_parser)->psz_object_name ); + p_parser->psz_object_name ); #endif break; @@ -561,13 +789,13 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) *p_index = (char)0; psz_option_value = p_index + 1; - if( !(*pp_parser)->i_config_items ) + if( !p_parser->i_config_items ) { continue; } /* try to match this option with one of the module's options */ - for( p_item = (*pp_parser)->p_config; + for( p_item = p_parser->p_config; p_item->i_type != CONFIG_HINT_END; p_item++ ) { @@ -600,6 +828,11 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) p_item->psz_name, (double)p_item->f_value ); #endif break; + case CONFIG_ITEM_KEY: + if( !*psz_option_value ) + break; /* ignore empty option */ + p_item->i_value = ConfigStringToKey( psz_option_value ); + break; default: vlc_mutex_lock( p_item->p_lock ); @@ -625,7 +858,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) } } - + vlc_list_release( p_list ); fclose( file ); @@ -646,7 +879,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) * * When we save we mustn't delete the config options of the modules that * haven't been loaded. So we cannot just create a new config file with the - * config structures we've got in memory. + * config structures we've got in memory. * I don't really know how to deal with this nicely, so I will use a completly * dumb method ;-) * I will load the config file in memory, but skipping all the sections of the @@ -657,7 +890,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) *****************************************************************************/ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) { - module_t **pp_parser; + module_t *p_parser; vlc_list_t *p_list; module_config_t *p_item; FILE *file; @@ -665,59 +898,77 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) int i_sizebuf = 0; char *p_bigbuffer, *p_index; vlc_bool_t b_backup; - char *psz_filename, *psz_homedir; + char *psz_filename, *psz_homedir, *psz_configfile; + int i_index; /* Acquire config file lock */ vlc_mutex_lock( &p_this->p_vlc->config_lock ); - psz_homedir = p_this->p_vlc->psz_homedir; - if( !psz_homedir ) + psz_configfile = p_this->p_vlc->psz_configfile; + if( !psz_configfile || !psz_configfile ) { - msg_Err( p_this, "psz_homedir is null" ); - vlc_mutex_unlock( &p_this->p_vlc->config_lock ); - return -1; - } - psz_filename = (char *)malloc( strlen("/" CONFIG_DIR "/" CONFIG_FILE) + - strlen(psz_homedir) + 1 ); - if( !psz_filename ) - { - msg_Err( p_this, "out of memory" ); - vlc_mutex_unlock( &p_this->p_vlc->config_lock ); - return -1; - } - sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir ); + psz_homedir = p_this->p_vlc->psz_homedir; + if( !psz_homedir ) + { + msg_Err( p_this, "psz_homedir is null" ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); + return -1; + } + psz_filename = (char *)malloc( sizeof("/" CONFIG_DIR "/" CONFIG_FILE) + + strlen(psz_homedir) ); + + if( psz_filename ) + sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir ); + + if( !psz_filename ) + { + msg_Err( p_this, "out of memory" ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); + return -1; + } #if defined( UNDER_CE ) - { - wchar_t psz_new[ MAX_PATH ]; - MultiByteToWideChar( CP_ACP, 0, psz_filename, -1, psz_new, MAX_PATH ); - if( CreateDirectory( psz_new, NULL ) ) { - msg_Err( p_this, "could not create %s", psz_filename ); + wchar_t psz_new[ MAX_PATH ]; + MultiByteToWideChar( CP_ACP, 0, psz_filename, -1, psz_new, + MAX_PATH ); + if( CreateDirectory( psz_new, NULL ) ) + { + msg_Err( p_this, "could not create %s", psz_filename ); + } } - } #elif defined( HAVE_ERRNO_H ) # if defined( WIN32 ) - if( mkdir( psz_filename ) && errno != EEXIST ) + if( mkdir( psz_filename ) && errno != EEXIST ) # else - if( mkdir( psz_filename, 0755 ) && errno != EEXIST ) + if( mkdir( psz_filename, 0755 ) && errno != EEXIST ) # endif - { - msg_Err( p_this, "could not create %s (%s)", - psz_filename, strerror(errno) ); - } + { + msg_Err( p_this, "could not create %s (%s)", + psz_filename, strerror(errno) ); + } #else - if( mkdir( psz_filename ) ) - { - msg_Err( p_this, "could not create %s", psz_filename ); - } + if( mkdir( psz_filename ) ) + { + msg_Err( p_this, "could not create %s", psz_filename ); + } #endif - strcat( psz_filename, "/" CONFIG_FILE ); - + strcat( psz_filename, "/" CONFIG_FILE ); + } + else + { + psz_filename = strdup( psz_configfile ); + if( !psz_filename ) + { + msg_Err( p_this, "out of memory" ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); + return -1; + } + } msg_Dbg( p_this, "opening config file %s", psz_filename ); @@ -757,24 +1008,24 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) { /* we found a section, check if we need to do a backup */ - for( pp_parser = (module_t **)p_list->pp_objects ; - *pp_parser ; - pp_parser++ ) + 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_index2 - &p_line[1]) - == strlen((*pp_parser)->psz_object_name) ) && - !memcmp( &p_line[1], (*pp_parser)->psz_object_name, - strlen((*pp_parser)->psz_object_name) ) ) + == (int)strlen(p_parser->psz_object_name) ) + && !memcmp( &p_line[1], p_parser->psz_object_name, + strlen(p_parser->psz_object_name) ) ) { if( !psz_module_name ) break; else if( !strcmp( psz_module_name, - (*pp_parser)->psz_object_name ) ) + p_parser->psz_object_name ) ) break; } } - if( !(*pp_parser) ) + if( i_index == p_list->i_count ) { /* we don't have this section in our list so we need to back * it up */ @@ -821,31 +1072,31 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) fprintf( file, "###\n### " COPYRIGHT_MESSAGE "\n###\n\n" ); /* Look for the selected module, if NULL then save everything */ - for( pp_parser = (module_t **)p_list->pp_objects ; - *pp_parser ; - pp_parser++ ) + 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( psz_module_name && strcmp( psz_module_name, - (*pp_parser)->psz_object_name ) ) + p_parser->psz_object_name ) ) continue; - if( !(*pp_parser)->i_config_items ) + if( !p_parser->i_config_items ) continue; msg_Dbg( p_this, "saving config for module \"%s\"", - (*pp_parser)->psz_object_name ); + p_parser->psz_object_name ); - fprintf( file, "[%s]", (*pp_parser)->psz_object_name ); - if( (*pp_parser)->psz_longname ) - fprintf( file, " # %s\n\n", (*pp_parser)->psz_longname ); + fprintf( file, "[%s]", p_parser->psz_object_name ); + if( p_parser->psz_longname ) + fprintf( file, " # %s\n\n", p_parser->psz_longname ); else fprintf( file, "\n\n" ); - for( p_item = (*pp_parser)->p_config; + for( p_item = p_parser->p_config; p_item->i_type != CONFIG_HINT_END; p_item++ ) { + char *psz_key; if( p_item->i_type & CONFIG_HINT ) /* ignore hints */ continue; @@ -858,13 +1109,26 @@ 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 ) + fprintf( file, "#" ); fprintf( file, "%s=%i\n", p_item->psz_name, p_item->i_value ); break; - + case CONFIG_ITEM_KEY: + if( p_item->psz_text ) + fprintf( file, "# %s (%s)\n", p_item->psz_text, + _("key") ); + psz_key = ConfigKeyToString( p_item->i_value ); + fprintf( file, "%s=%s\n", p_item->psz_name, + psz_key ? psz_key : "" ); + if ( psz_key ) free( psz_key ); + 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 ) + fprintf( file, "#" ); fprintf( file, "%s=%f\n", p_item->psz_name, (double)p_item->f_value ); break; @@ -873,6 +1137,10 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) 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 )) ) + fprintf( file, "#" ); fprintf( file, "%s=%s\n", p_item->psz_name, p_item->psz_value ? p_item->psz_value : "" ); } @@ -909,10 +1177,11 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], vlc_bool_t b_ignore_errors ) { int i_cmd, i_index, i_opts, i_shortopts, flag, i_verbose = 0; - module_t **pp_parser; + module_t *p_parser; vlc_list_t *p_list; module_config_t *p_item; struct option *p_longopts; + int i_modules_index; /* Short options */ module_config_t *pp_shortopts[256]; @@ -922,8 +1191,6 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], p_this->p_vlc->i_argc = *pi_argc; p_this->p_vlc->ppsz_argv = ppsz_argv; - p_this->p_vlc->p_channel = NULL; - #ifdef SYS_DARWIN /* When vlc.app is run by double clicking in Mac OS X, the 2nd arg * is the PSN - process serial number (a unique PID-ish thingie) @@ -952,15 +1219,16 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], */ i_opts = 0; - for( pp_parser = (module_t **)p_list->pp_objects ; - *pp_parser ; - pp_parser++ ) + for( i_modules_index = 0; i_modules_index < p_list->i_count; + i_modules_index++ ) { + p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ; + /* count the number of exported configuration options (to allocate * longopts). We also need to allocate space for too options when * dealing with boolean to allow for --foo and --no-foo */ - i_opts += (*pp_parser)->i_config_items - + 2 * (*pp_parser)->i_bool_items; + i_opts += p_parser->i_config_items + + 2 * p_parser->i_bool_items; } p_longopts = malloc( sizeof(struct option) * (i_opts + 1) ); @@ -1006,14 +1274,15 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], /* Fill the p_longopts and psz_shortopts structures */ i_index = 0; - for( pp_parser = (module_t **)p_list->pp_objects ; - *pp_parser ; - pp_parser++ ) + for( i_modules_index = 0; i_modules_index < p_list->i_count; + i_modules_index++ ) { - if( !(*pp_parser)->i_config_items ) + p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ; + + if( !p_parser->i_config_items ) continue; - for( p_item = (*pp_parser)->p_config; + for( p_item = p_parser->p_config; p_item->i_type != CONFIG_HINT_END; p_item++ ) { @@ -1110,6 +1379,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], { case CONFIG_ITEM_STRING: case CONFIG_ITEM_FILE: + case CONFIG_ITEM_DIRECTORY: case CONFIG_ITEM_MODULE: config_PutPsz( p_this, psz_name, optarg ); break; @@ -1119,6 +1389,9 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], case CONFIG_ITEM_FLOAT: config_PutFloat( p_this, psz_name, (float)atof(optarg) ); break; + case CONFIG_ITEM_KEY: + config_PutInt( p_this, psz_name, ConfigStringToKey( optarg ) ); + break; case CONFIG_ITEM_BOOL: config_PutInt( p_this, psz_name, !flag ); break; @@ -1134,6 +1407,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], { case CONFIG_ITEM_STRING: case CONFIG_ITEM_FILE: + case CONFIG_ITEM_DIRECTORY: case CONFIG_ITEM_MODULE: config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg ); break; @@ -1180,13 +1454,21 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], /* Internal error: unknown option */ if( !b_ignore_errors ) { - fprintf( stderr, "unknown option `%s'\n", ppsz_argv[optind-1] ); + fprintf( stderr, "%s: unknown option ", + p_this->p_vlc->psz_object_name ); + if( optopt ) + { + fprintf( stderr, "`-%c'\n", optopt ); + } + else + { + fprintf( stderr, "`%s'\n", ppsz_argv[optind-1] ); + } fprintf( stderr, "Try `%s --help' for more information.\n", p_this->p_vlc->psz_object_name ); free( p_longopts ); free( psz_shortopts ); - if( b_ignore_errors ) free( ppsz_argv ); return -1; } } @@ -1216,7 +1498,7 @@ char *config_GetHomeDir( void ) struct passwd *p_pw = NULL; #endif -#ifdef WIN32 +#if defined(WIN32) || defined(UNDER_CE) typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD, LPTSTR ); # define CSIDL_FLAG_CREATE 0x8000 @@ -1226,7 +1508,7 @@ char *config_GetHomeDir( void ) HINSTANCE shfolder_dll; SHGETFOLDERPATH SHGetFolderPath ; - /* load the shell32 dll to retreive SHGetFolderPath */ + /* load the shfolder dll to retrieve SHGetFolderPath */ if( ( shfolder_dll = LoadLibrary("shfolder.dll") ) != NULL ) { SHGetFolderPath = (void *)GetProcAddress( shfolder_dll, @@ -1277,3 +1559,65 @@ char *config_GetHomeDir( void ) return p_homedir; } + + +static int ConfigStringToKey( char *psz_key ) +{ + int i_key = 0; + unsigned int i; + char *psz_parser = strchr( psz_key, '-' ); + while( psz_parser && psz_parser != psz_key ) + { + for( i = 0; i < sizeof(modifiers) / sizeof(key_descriptor_t); i++ ) + { + if( !strncasecmp( modifiers[i].psz_key_string, psz_key, + strlen( modifiers[i].psz_key_string ) ) ) + { + i_key |= modifiers[i].i_key_code; + } + } + psz_key = psz_parser + 1; + psz_parser = strchr( psz_key, '-' ); + } + for( i = 0; i < sizeof(keys) / sizeof( key_descriptor_t ); i++ ) + { + if( !strcasecmp( keys[i].psz_key_string, psz_key ) ) + { + i_key |= keys[i].i_key_code; + break; + } + } + return i_key; +} + +static char *ConfigKeyToString( int i_key ) +{ + char *psz_key = malloc( 100 ); + char *p; + size_t index; + + if ( !psz_key ) + { + return NULL; + } + *psz_key = '\0'; + p = psz_key; + for( index = 0; index < (sizeof(modifiers) / sizeof(key_descriptor_t)); + index++ ) + { + if( i_key & modifiers[index].i_key_code ) + { + p += sprintf( p, "%s-", modifiers[index].psz_key_string ); + } + } + for( index = 0; index < (sizeof(keys) / sizeof( key_descriptor_t)); + index++) + { + if( (int)( i_key & ~KEY_MODIFIER ) == keys[index].i_key_code ) + { + p += sprintf( p, "%s", keys[index].psz_key_string ); + break; + } + } + return psz_key; +}