* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.35 2002/08/08 00:35:11 sam Exp $
+ * $Id: configuration.c,v 1.67 2003/11/05 00:39:17 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*****************************************************************************/
#include <vlc/vlc.h>
+#include "vlc_keys.h"
#include <stdio.h> /* sprintf() */
#include <stdlib.h> /* free(), strtol() */
#include <string.h> /* strdup() */
-#include <errno.h> /* errno */
+#ifdef HAVE_ERRNO_H
+# include <errno.h> /* errno */
+#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* getuid() */
# include <getopt.h> /* getopt() */
# endif
#else
-# include "GNUgetopt/getopt.h"
+# include "../extras/getopt.h"
#endif
#if defined(HAVE_GETPWUID)
-#include <pwd.h> /* getpwuid() */
+# include <pwd.h> /* getpwuid() */
+#endif
+
+#if defined( HAVE_SYS_STAT_H )
+# include <sys/stat.h>
+#endif
+#if defined( HAVE_SYS_TYPES_H )
+# include <sys/types.h>
#endif
+#if defined( WIN32 ) && !defined( UNDER_CE )
+# include <direct.h>
+#endif
+
-#include <sys/stat.h>
-#include <sys/types.h>
+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
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 );
*****************************************************************************
* 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
}
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 );
*****************************************************************************
* 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 );
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 );
}
/*****************************************************************************
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 );
}
}
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 )
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 );
}
}
* config_FindConfig: find the config structure associated with an option.
*****************************************************************************
* FIXME: This function really needs to be optimized.
+ * FIXME: And now even more.
*****************************************************************************/
-module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name)
+module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name )
{
- module_t *p_module;
+ vlc_list_t *p_list;
+ module_t *p_parser;
module_config_t *p_item;
+ int i_index;
if( !psz_name ) return NULL;
- for( p_module = p_this->p_vlc->p_module_bank->first ;
- p_module != NULL ;
- p_module = p_module->next )
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- for( p_item = p_module->p_config;
+ 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++ )
{
/* ignore hints */
continue;
if( !strcmp( psz_name, p_item->psz_name ) )
+ {
+ vlc_list_release( p_list );
return p_item;
+ }
}
}
+ vlc_list_release( p_list );
+
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.
*****************************************************************************
return;
}
- /* Initialize the global lock */
- vlc_mutex_init( p_module, &p_module->object_lock );
-
/* 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 )
+ {
+ 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 )
{
- 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_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;
}
- /* the callback pointer is only valid when the module is loaded so this
- * value is set in module_activate() and reset in module_deactivate() */
- p_module->p_config[i].pf_callback = NULL;
+ p_module->p_config[i].pf_callback = p_orig[i].pf_callback;
}
}
module_config_t *p_item = p_module->p_config;
int i;
+ if( p_item == NULL )
+ {
+ return;
+ }
+
for( ; p_item->i_type != CONFIG_HINT_END ; p_item++ )
{
if( p_item->psz_type )
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 );
p_module->p_config = NULL;
-
- /* Remove the global lock */
- vlc_mutex_destroy( &p_module->object_lock );
}
/*****************************************************************************
}
}
+/*****************************************************************************
+ * 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.
*****************************************************************************
*****************************************************************************/
int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
- module_t *p_module;
+ 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;
-
- /* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ 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" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
- 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" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
return -1;
}
- sprintf( psz_filename, "%s/" CONFIG_DIR "/" CONFIG_FILE, psz_homedir );
msg_Dbg( p_this, "opening config file %s", psz_filename );
+ /* Acquire config file lock */
+ vlc_mutex_lock( &p_this->p_vlc->config_lock );
+
file = fopen( psz_filename, "rt" );
if( !file )
{
}
/* Look for the selected module, if NULL then save everything */
- for( p_module = p_this->p_vlc->p_module_bank->first ; p_module != NULL ;
- p_module = p_module->next )
+ 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( psz_module_name
- && strcmp( psz_module_name, p_module->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(p_module->psz_object_name) ) &&
- !memcmp( &line[1], p_module->psz_object_name,
- strlen(p_module->psz_object_name) ) )
+ if( (line[0] == '[')
+ && (p_index = strchr(line,']'))
+ && (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\"",
- p_module->psz_object_name );
+ p_parser->psz_object_name );
#endif
break;
*p_index = (char)0;
psz_option_value = p_index + 1;
+ if( !p_parser->i_config_items )
+ {
+ continue;
+ }
+
/* try to match this option with one of the module's options */
- for( p_item = p_module->p_config;
+ for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
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 );
}
}
-
+
+ vlc_list_release( p_list );
+
fclose( file );
free( psz_filename );
*
* 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
*****************************************************************************/
int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
- module_t *p_module;
+ module_t *p_parser;
+ vlc_list_t *p_list;
module_config_t *p_item;
FILE *file;
char p_line[1024], *p_index2;
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 );
+ }
+ }
+
+#elif defined( HAVE_ERRNO_H )
+# if defined( WIN32 )
+ if( mkdir( psz_filename ) && errno != EEXIST )
+# else
+ if( mkdir( psz_filename, 0755 ) && errno != EEXIST )
+# endif
+ {
+ msg_Err( p_this, "could not create %s (%s)",
+ psz_filename, strerror(errno) );
+ }
-#ifndef WIN32
- if( mkdir( psz_filename, 0755 ) && errno != EEXIST )
#else
- if( mkdir( psz_filename ) && errno != EEXIST )
+ if( mkdir( psz_filename ) )
+ {
+ msg_Err( p_this, "could not create %s", psz_filename );
+ }
+
#endif
+
+ strcat( psz_filename, "/" CONFIG_FILE );
+ }
+ else
{
- msg_Err( p_this, "could not create %s (%s)",
- psz_filename, strerror(errno) );
+ 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;
+ }
}
- strcat( psz_filename, "/" CONFIG_FILE );
-
-
msg_Dbg( p_this, "opening config file %s", psz_filename );
file = fopen( psz_filename, "rt" );
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 );
}
p_bigbuffer[0] = 0;
+ /* List all available modules */
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
/* backup file into memory, we only need to backup the sections we won't
* save later on */
b_backup = 0;
{
if( (p_line[0] == '[') && (p_index2 = strchr(p_line,']')))
{
+
/* we found a section, check if we need to do a backup */
- for( p_module = p_this->p_vlc->p_module_bank->first;
- p_module != NULL;
- p_module = p_module->next )
+ 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(p_module->psz_object_name) ) &&
- !memcmp( &p_line[1], p_module->psz_object_name,
- strlen(p_module->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,
- p_module->psz_object_name ) )
+ p_parser->psz_object_name ) )
break;
}
}
- if( !p_module )
+ if( i_index == p_list->i_count )
{
/* we don't have this section in our list so we need to back
* it up */
msg_Warn( p_this, "could not open config file %s for writing",
psz_filename );
free( psz_filename );
+ vlc_list_release( p_list );
vlc_mutex_unlock( &p_this->p_vlc->config_lock );
return -1;
}
fprintf( file, "###\n### " COPYRIGHT_MESSAGE "\n###\n\n" );
/* Look for the selected module, if NULL then save everything */
- for( p_module = p_this->p_vlc->p_module_bank->first ; p_module != NULL ;
- p_module = p_module->next )
+ 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,
- p_module->psz_object_name ) )
+ p_parser->psz_object_name ) )
continue;
- if( !p_module->i_config_items )
+ if( !p_parser->i_config_items )
continue;
msg_Dbg( p_this, "saving config for module \"%s\"",
- p_module->psz_object_name );
+ p_parser->psz_object_name );
- fprintf( file, "[%s]", p_module->psz_object_name );
- if( p_module->psz_longname )
- fprintf( file, " # %s\n\n", p_module->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 = p_module->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;
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;
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 : "" );
}
fprintf( file, "\n" );
}
+ vlc_list_release( p_list );
/*
* Restore old settings from the config in file
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;
- module_t *p_module;
+ int i_cmd, i_index, i_opts, i_shortopts, flag, i_verbose = 0;
+ 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];
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)
}
#endif
+ /* List all modules */
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
/*
* Generate the longopts and shortopts structures used by getopt_long
*/
i_opts = 0;
- for( p_module = p_this->p_vlc->p_module_bank->first;
- p_module != NULL ;
- p_module = p_module->next )
+ 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 += (p_module->i_config_items + 2 * p_module->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) );
if( p_longopts == NULL )
{
msg_Err( p_this, "out of memory" );
+ vlc_list_release( p_list );
return -1;
}
{
msg_Err( p_this, "out of memory" );
free( p_longopts );
+ vlc_list_release( p_list );
return -1;
}
msg_Err( p_this, "out of memory" );
free( psz_shortopts );
free( p_longopts );
+ vlc_list_release( p_list );
return -1;
}
memcpy( ppsz_argv, p_this->p_vlc->ppsz_argv,
/* Fill the p_longopts and psz_shortopts structures */
i_index = 0;
- for( p_module = p_this->p_vlc->p_module_bank->first ;
- p_module != NULL ;
- p_module = p_module->next )
+ for( i_modules_index = 0; i_modules_index < p_list->i_count;
+ i_modules_index++ )
{
- for( p_item = p_module->p_config;
+ p_parser = (module_t *)p_list->p_values[i_modules_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++ )
{
{
psz_shortopts[i_shortopts] = ':';
i_shortopts++;
+
+ if( p_item->i_short == 'v' )
+ {
+ psz_shortopts[i_shortopts] = ':';
+ i_shortopts++;
+ }
}
}
}
}
+ /* We don't need the module list anymore */
+ vlc_list_release( p_list );
+
/* Close the longopts and shortopts structures */
memset( &p_longopts[i_index], 0, sizeof(struct option) );
psz_shortopts[i_shortopts] = '\0';
{
case CONFIG_ITEM_STRING:
case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_DIRECTORY:
case CONFIG_ITEM_MODULE:
config_PutPsz( p_this, psz_name, optarg );
break;
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;
{
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;
case CONFIG_ITEM_INTEGER:
- config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
- atoi(optarg));
+ if( i_cmd == 'v' )
+ {
+ if( optarg )
+ {
+ if( *optarg == 'v' ) /* eg. -vvv */
+ {
+ i_verbose++;
+ while( *optarg == 'v' )
+ {
+ i_verbose++;
+ optarg++;
+ }
+ }
+ else
+ {
+ i_verbose += atoi( optarg ); /* eg. -v2 */
+ }
+ }
+ else
+ {
+ i_verbose++; /* -v */
+ }
+ config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
+ i_verbose );
+ }
+ else
+ {
+ config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
+ atoi(optarg) );
+ }
break;
case CONFIG_ITEM_BOOL:
config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 );
/* 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;
}
}
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
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,
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;
+}
projects / vlc / blobdiff