X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fconfiguration.c;h=a24da6a091493a65e7b288fff3f1edcc94eccf10;hb=e3c317c2748850a60311b84624c6667888c82e01;hp=455f05552be5f1b198846640bba7c7cab64b8824;hpb=be8ca6e9a9924ccdf8c72449b85bdb97e05e87a6;p=vlc diff --git a/src/misc/configuration.c b/src/misc/configuration.c index 455f05552b..a24da6a091 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.43 2002/11/10 18:04:23 sam Exp $ + * $Id: configuration.c,v 1.58 2003/06/27 13:38:54 sam Exp $ * * Authors: Gildas Bazin * @@ -43,7 +43,7 @@ #endif #if defined(HAVE_GETPWUID) -#include /* getpwuid() */ +# include /* getpwuid() */ #endif #if defined( HAVE_SYS_STAT_H ) @@ -52,6 +52,9 @@ #if defined( HAVE_SYS_TYPES_H ) # include #endif +#if defined( WIN32 ) && !defined( UNDER_CE ) +# include +#endif /***************************************************************************** * config_GetInt: get the value of an int variable @@ -114,7 +117,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 +138,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,9 +158,9 @@ 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; @@ -166,11 +170,12 @@ void __config_PutPsz( vlc_object_t *p_this, /* 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 ); @@ -182,7 +187,7 @@ void __config_PutPsz( vlc_object_t *p_this, /* free old string */ if( p_config->psz_value ) free( 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; vlc_mutex_unlock( p_config->p_lock ); @@ -209,7 +214,7 @@ void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) /* 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) && @@ -219,7 +224,23 @@ void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) return; } - p_config->i_value = 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; + } if( p_config->pf_callback ) { @@ -243,7 +264,7 @@ void __config_PutFloat( vlc_object_t *p_this, /* 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,7 +273,23 @@ void __config_PutFloat( vlc_object_t *p_this, return; } - p_config->f_value = 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; + } if( p_config->pf_callback ) { @@ -268,22 +305,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++ ) { @@ -349,19 +387,28 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig ) 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].i_value_orig = p_orig[i].i_value; + p_module->p_config[i].i_min = p_orig[i].i_min; + p_module->p_config[i].i_max = p_orig[i].i_max; p_module->p_config[i].f_value = p_orig[i].f_value; + p_module->p_config[i].f_value_orig = p_orig[i].f_value; + p_module->p_config[i].f_min = p_orig[i].f_min; + p_module->p_config[i].f_max = p_orig[i].f_max; p_module->p_config[i].b_dirty = p_orig[i].b_dirty; + p_module->p_config[i].b_advanced = p_orig[i].b_advanced; 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; @@ -416,12 +463,15 @@ void config_Free( module_t *p_module ) if( p_item->psz_value ) free( p_item->psz_value ); + if( p_item->psz_value_orig ) + free( p_item->psz_value_orig ); + 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 ); - } + { + for( i = 0; p_item->ppsz_list[i]; i++ ) + free(p_item->ppsz_list[i]); + free( p_item->ppsz_list ); + } } free( p_module->p_config ); @@ -459,6 +509,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,13 +552,14 @@ 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; + int i_index; psz_homedir = p_this->p_vlc->psz_homedir; if( !psz_homedir ) @@ -507,31 +593,31 @@ 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; } /* The config file is organized in sections, one per module. Look for * the interesting section ( a section is of the form [foo] ) */ - rewind( file ); + fseek( file, 0L, SEEK_SET ); while( fgets( line, 1024, file ) ) { 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 +647,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++ ) { @@ -625,7 +711,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) } } - + vlc_list_release( p_list ); fclose( file ); @@ -646,7 +732,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 +743,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; @@ -666,6 +752,7 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) char *p_bigbuffer, *p_index; vlc_bool_t b_backup; char *psz_filename, *psz_homedir; + int i_index; /* Acquire config file lock */ vlc_mutex_lock( &p_this->p_vlc->config_lock ); @@ -687,7 +774,17 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) } sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir ); -#ifdef HAVE_ERRNO_H +#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 ); + } + } + +#elif defined( HAVE_ERRNO_H ) # if defined( WIN32 ) if( mkdir( psz_filename ) && errno != EEXIST ) # else @@ -719,9 +816,9 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) else { /* look for file size */ - fseek( file, 0, SEEK_END ); + fseek( file, 0L, SEEK_END ); i_sizebuf = ftell( file ); - rewind( file ); + fseek( file, 0L, SEEK_SET ); } p_bigbuffer = p_index = malloc( i_sizebuf+1 ); @@ -747,24 +844,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 */ @@ -811,28 +908,27 @@ 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++ ) { @@ -848,6 +944,8 @@ 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; @@ -855,6 +953,8 @@ 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, _("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; @@ -863,6 +963,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 : "" ); } @@ -899,10 +1003,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]; @@ -942,15 +1047,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) ); @@ -996,14 +1102,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++ ) { @@ -1100,6 +1207,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; @@ -1124,6 +1232,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; @@ -1170,7 +1279,16 @@ 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 ); @@ -1206,7 +1324,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 @@ -1216,7 +1334,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,