/*****************************************************************************
* configuration.c management of the modules configuration
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.66 2003/10/29 01:33:27 gbazin Exp $
+ * Copyright (C) 2001-2004 the VideoLAN team
+ * $Id$
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc/vlc.h>
#include "vlc_keys.h"
+#include "charset.h"
#include <stdio.h> /* sprintf() */
#include <stdlib.h> /* free(), strtol() */
#include <string.h> /* strdup() */
-#ifdef HAVE_ERRNO_H
-# include <errno.h> /* errno */
+#include <errno.h> /* errno */
+
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
#endif
#ifdef HAVE_UNISTD_H
#if defined( HAVE_SYS_TYPES_H )
# include <sys/types.h>
#endif
-#if defined( WIN32 ) && !defined( UNDER_CE )
-# include <direct.h>
+#if defined( WIN32 )
+# if !defined( UNDER_CE )
+# include <direct.h>
+# endif
+#include <tchar.h>
#endif
+#if defined( WIN32 ) || defined( UNDER_CE )
+# define DIR_SEP "\\"
+#else
+# define DIR_SEP "/"
+#endif
static int ConfigStringToKey( char * );
static char *ConfigKeyToString( int );
break;
case CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_MODULE_CAT:
+ case CONFIG_ITEM_MODULE_LIST:
+ case CONFIG_ITEM_MODULE_LIST_CAT:
+ i_type = VLC_VAR_MODULE;
+ break;
+
case CONFIG_ITEM_STRING:
i_type = VLC_VAR_STRING;
break;
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_LIST) &&
+ (p_config->i_type!=CONFIG_ITEM_MODULE_LIST_CAT) &&
+ (p_config->i_type!=CONFIG_ITEM_MODULE_CAT) &&
(p_config->i_type!=CONFIG_ITEM_MODULE) )
{
msg_Err( p_this, "option %s does not refer to a string", psz_name );
return NULL;
}
+
/* return a copy of the string */
vlc_mutex_lock( p_config->p_lock );
if( p_config->psz_value ) psz_value = strdup( p_config->psz_value );
p_config = config_FindConfig( p_this, psz_name );
+
/* sanity checks */
if( !p_config )
{
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_LIST) &&
+ (p_config->i_type!=CONFIG_ITEM_MODULE_CAT) &&
+ (p_config->i_type!=CONFIG_ITEM_MODULE_LIST_CAT) &&
(p_config->i_type!=CONFIG_ITEM_MODULE) )
{
msg_Err( p_this, "option %s does not refer to a string", psz_name );
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 );
p_config->i_value = i_value;
}
+ p_config->b_dirty = VLC_TRUE;
+
val.i_int = p_config->i_value;
if( p_config->pf_callback )
p_config->f_value = f_value;
}
+ p_config->b_dirty = VLC_TRUE;
+
val.f_float = p_config->f_value;
if( p_config->pf_callback )
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.
*****************************************************************************
/* 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] = p_orig[i];
+
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].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;
p_module->p_config[i].psz_name = p_orig[i].psz_name ?
strdup( p_orig[i].psz_name ) : NULL;
+ p_module->p_config[i].psz_current = p_orig[i].psz_current?
+ strdup( p_orig[i].psz_current ) : 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 ?
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 )
+ {
+ 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] = p_orig[i].ppsz_list[j] ?
+ strdup( p_orig[i].ppsz_list[j] ) : NULL ;
+ 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] = _(p_orig[i].ppsz_list_text[j]) ?
+ strdup( _(p_orig[i].ppsz_list_text[j] ) ) : NULL ;
+ 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];
+ }
+ }
+ }
+
+ /* duplicate the actions list */
+ if( p_orig[i].i_action )
{
- 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 )
+ int j;
+
+ p_module->p_config[i].ppf_action =
+ malloc( p_orig[i].i_action * sizeof(void *) );
+ p_module->p_config[i].ppsz_action_text =
+ malloc( p_orig[i].i_action * sizeof(char *) );
+
+ for( j = 0; j < p_orig[i].i_action; j++ )
{
- 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].ppf_action[j] =
+ p_orig[i].ppf_action[j];
+ p_module->p_config[i].ppsz_action_text[j] =
+ p_orig[i].ppsz_action_text[j] ?
+ strdup( p_orig[i].ppsz_action_text[j] ) : NULL;
}
- p_module->p_config[i].ppsz_list[j] = NULL;
}
p_module->p_config[i].pf_callback = p_orig[i].pf_callback;
if( p_item->psz_name )
free( p_item->psz_name );
+ if( p_item->psz_current )
+ free( p_item->psz_current );
+
if( p_item->psz_text )
free( p_item->psz_text );
if( p_item->psz_value_orig )
free( p_item->psz_value_orig );
- if( p_item->ppsz_list )
+ if( p_item->psz_value_saved )
+ free( p_item->psz_value_saved );
+
+ if( p_item->i_list )
{
- for( i = 0; p_item->ppsz_list[i]; i++ )
- free(p_item->ppsz_list[i]);
- free( p_item->ppsz_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 );
+ }
+
+ if( p_item->i_action )
+ {
+ for( i = 0; i < p_item->i_action; i++ )
+ {
+ if( p_item->ppsz_action_text[i] )
+ free( p_item->ppsz_action_text[i] );
+ }
+ if( p_item->ppf_action ) free( p_item->ppf_action );
+ if( p_item->ppsz_action_text ) free( p_item->ppsz_action_text );
}
}
module_t *p_module;
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
}
vlc_list_release( p_list );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
}
/*****************************************************************************
char *psz_filename, *psz_homedir, *psz_configfile;
int i_index;
- psz_configfile = p_this->p_vlc->psz_configfile;
+ psz_configfile = p_this->p_libvlc->psz_configfile;
if( !psz_configfile || !psz_configfile )
{
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
psz_filename = (char *)malloc( sizeof("/" CONFIG_DIR "/" CONFIG_FILE) +
strlen(psz_homedir) );
if( psz_filename )
- sprintf( psz_filename, "%s/" CONFIG_DIR "/" CONFIG_FILE,
+ sprintf( psz_filename,
+ "%s" DIR_SEP CONFIG_DIR DIR_SEP CONFIG_FILE,
psz_homedir );
}
else
msg_Dbg( p_this, "opening config file %s", psz_filename );
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
- file = fopen( psz_filename, "rt" );
+ file = utf8_fopen( psz_filename, "rt" );
if( !file )
{
msg_Warn( p_this, "config file %s does not exist yet", psz_filename );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
case CONFIG_ITEM_INTEGER:
if( !*psz_option_value )
break; /* ignore empty option */
- p_item->i_value = atoi( psz_option_value);
+ 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 );
case CONFIG_ITEM_FLOAT:
if( !*psz_option_value )
break; /* ignore empty option */
- p_item->f_value = (float)atof( psz_option_value);
-#if O
+ p_item->f_value = (float)i18n_atof( psz_option_value);
+ 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
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:
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 ||
+ (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
fclose( file );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
+
+ return 0;
+}
+
+/*****************************************************************************
+ * config_CreateDir: Create configuration directory if it doesn't exist.
+ *****************************************************************************/
+int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname )
+{
+ if( !psz_dirname && !*psz_dirname ) return -1;
+
+ if( utf8_mkdir( psz_dirname ) && ( errno != EEXIST ) )
+ {
+ msg_Err( p_this, "could not create %s (%s)",
+ psz_dirname, strerror(errno) );
+ return -1;
+ }
return 0;
}
* save.
* Really stupid no ?
*****************************************************************************/
-int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
+static 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;
int i_index;
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
- psz_configfile = p_this->p_vlc->psz_configfile;
+ psz_configfile = p_this->p_libvlc->psz_configfile;
if( !psz_configfile || !psz_configfile )
{
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->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 );
+ sprintf( psz_filename, "%s" DIR_SEP CONFIG_DIR, psz_homedir );
if( !psz_filename )
{
msg_Err( p_this, "out of memory" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->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) );
- }
-
-#else
- if( mkdir( psz_filename ) )
- {
- msg_Err( p_this, "could not create %s", psz_filename );
- }
-
-#endif
+ config_CreateDir( p_this, psz_filename );
- strcat( psz_filename, "/" CONFIG_FILE );
+ strcat( psz_filename, DIR_SEP CONFIG_FILE );
}
else
{
if( !psz_filename )
{
msg_Err( p_this, "out of memory" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
}
msg_Dbg( p_this, "opening config file %s", psz_filename );
- file = fopen( psz_filename, "rt" );
+ file = utf8_fopen( psz_filename, "rt" );
if( !file )
{
msg_Warn( p_this, "config file %s does not exist yet", psz_filename );
msg_Err( p_this, "out of memory" );
if( file ) fclose( file );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
p_bigbuffer[0] = 0;
/* we don't have this section in our list so we need to back
* it up */
*p_index2 = 0;
+#if 0
msg_Dbg( p_this, "backing up config for unknown module \"%s\"",
&p_line[1] );
+#endif
*p_index2 = ']';
b_backup = 1;
* Save module config in file
*/
- file = fopen( psz_filename, "wt" );
+ file = utf8_fopen( psz_filename, "wt" );
if( !file )
{
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 );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
- fprintf( file, "###\n### " COPYRIGHT_MESSAGE "\n###\n\n" );
+ fprintf( file, "###\n### " COPYRIGHT_MESSAGE "\n###\n\n"
+ "###\n### lines begining with a '#' character are comments\n###\n\n" );
/* Look for the selected module, if NULL then save everything */
for( i_index = 0; i_index < p_list->i_count; i_index++ )
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 )
- fprintf( file, " # %s\n\n", p_parser->psz_longname );
+ utf8_fprintf( file, " # %s\n\n", p_parser->psz_longname );
else
fprintf( file, "\n\n" );
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( p_item->i_type & CONFIG_HINT )
/* ignore hints */
continue;
+ /* Ignore deprecated options */
+ if( p_item->psz_current )
+ continue;
+ 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( !psz_value ) psz_value = p_item->psz_value_orig;
+ }
+ else
+ {
+ p_item->b_dirty = VLC_FALSE;
+ }
switch( p_item->i_type )
{
case CONFIG_ITEM_BOOL:
case CONFIG_ITEM_INTEGER:
if( p_item->psz_text )
- fprintf( file, "# %s (%s)\n", p_item->psz_text,
+ utf8_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,
+ utf8_fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("key") );
- psz_key = ConfigKeyToString( p_item->i_value );
+ if( i_value == p_item->i_value_orig )
+ fprintf( file, "#" );
+ 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,
+ utf8_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,
+ utf8_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( b_autosave && !p_item->b_autosave ) break;
+
+ 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 )) ||
+ !psz_value || !p_item->psz_value_orig)
+ p_item->psz_value_saved = psz_value ? strdup(psz_value):0;
}
}
fclose( file );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
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, i_count;
+
+ /* Check if there's anything to save */
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ i_count = p_list->i_count;
+ for( i_index = 0; i_index < 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;
+ }
+ if( p_item->i_type != CONFIG_HINT_END ) break;
+ }
+ vlc_list_release( p_list );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
+
+ if( i_index == 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
*****************************************************************************
char *psz_shortopts;
/* Set default configuration and copy arguments */
- p_this->p_vlc->i_argc = *pi_argc;
- p_this->p_vlc->ppsz_argv = ppsz_argv;
+ p_this->p_libvlc->i_argc = *pi_argc;
+ p_this->p_libvlc->ppsz_argv = ppsz_argv;
-#ifdef SYS_DARWIN
- /* When vlc.app is run by double clicking in Mac OS X, the 2nd arg
+#ifdef __APPLE__
+ /* 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)
* still ok for real Darwin & when run from command line */
if ( (*pi_argc > 1) && (strncmp( ppsz_argv[ 1 ] , "-psn" , 4 ) == 0) )
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
+ * longopts). We also need to allocate space for two options when
* dealing with boolean to allow for --foo and --no-foo */
i_opts += p_parser->i_config_items
+ 2 * p_parser->i_bool_items;
vlc_list_release( p_list );
return -1;
}
- memcpy( ppsz_argv, p_this->p_vlc->ppsz_argv,
+ memcpy( ppsz_argv, p_this->p_libvlc->ppsz_argv,
*pi_argc * sizeof(char *) );
}
/* Store the configuration option */
p_conf = config_FindConfig( p_this, psz_name );
-
- if( p_conf ) switch( p_conf->i_type )
+ if( p_conf )
{
- 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_INTEGER:
- config_PutInt( p_this, psz_name, atoi(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;
- }
+ /* Check if the option is deprecated */
+ if( p_conf->psz_current )
+ {
+ if( !strcmp(p_conf->psz_current,"SUPPRESSED") )
+ {
+ if( !b_ignore_errors )
+ {
+ fprintf(stderr,
+ "Warning: option --%s is no longer used.\n",
+ p_conf->psz_name);
+ }
+ continue;
+ }
+ if( !b_ignore_errors )
+ {
+ if( p_conf->b_strict )
+ {
+ fprintf( stderr,
+ "Error: option --%s is deprecated. "
+ "Use --%s instead.\n",
+ p_conf->psz_name, p_conf->psz_current);
+ /*free */
+ for( i_index = 0; p_longopts[i_index].name; i_index++ )
+ free( (char *)p_longopts[i_index].name );
+
+ free( p_longopts );
+ free( psz_shortopts );
+ return -1;
+ }
+ fprintf(stderr,
+ "Warning: option --%s is deprecated. "
+ "You should use --%s instead.\n",
+ p_conf->psz_name, p_conf->psz_current);
+ }
+ psz_name=p_conf->psz_current;
+ p_conf = config_FindConfig( p_this, psz_name );
+ }
- continue;
+ switch( p_conf->i_type )
+ {
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_DIRECTORY:
+ case CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_MODULE_LIST:
+ case CONFIG_ITEM_MODULE_LIST_CAT:
+ case CONFIG_ITEM_MODULE_CAT:
+ config_PutPsz( p_this, psz_name, optarg );
+ break;
+ case CONFIG_ITEM_INTEGER:
+ config_PutInt( p_this, psz_name, strtol(optarg, 0, 0));
+ 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;
+ }
+ continue;
+ }
}
/* A short option has been recognized */
{
switch( pp_shortopts[i_cmd]->i_type )
{
- 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:
- if( i_cmd == 'v' )
- {
- if( optarg )
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_DIRECTORY:
+ case CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_MODULE_CAT:
+ case CONFIG_ITEM_MODULE_LIST:
+ case CONFIG_ITEM_MODULE_LIST_CAT:
+ config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg );
+ break;
+ case CONFIG_ITEM_INTEGER:
+ if( i_cmd == 'v' )
{
- if( *optarg == 'v' ) /* eg. -vvv */
+ if( optarg )
{
- i_verbose++;
- while( *optarg == 'v' )
+ if( *optarg == 'v' ) /* eg. -vvv */
{
i_verbose++;
- optarg++;
+ while( *optarg == 'v' )
+ {
+ i_verbose++;
+ optarg++;
+ }
+ }
+ else
+ {
+ i_verbose += atoi( optarg ); /* eg. -v2 */
}
}
else
{
- i_verbose += atoi( optarg ); /* eg. -v2 */
+ i_verbose++; /* -v */
}
+ config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
+ i_verbose );
}
else
{
- i_verbose++; /* -v */
+ config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
+ strtol(optarg, 0, 0) );
}
- 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 );
- break;
+ break;
+ case CONFIG_ITEM_BOOL:
+ config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 );
+ break;
}
continue;
/* Internal error: unknown option */
if( !b_ignore_errors )
{
- fprintf( stderr, "%s: unknown option ",
- p_this->p_vlc->psz_object_name );
+ fprintf( stderr, "%s: unknown option"
+ " or missing mandatory argument ",
+ p_this->p_libvlc->psz_object_name );
if( optopt )
{
fprintf( stderr, "`-%c'\n", optopt );
fprintf( stderr, "`%s'\n", ppsz_argv[optind-1] );
}
fprintf( stderr, "Try `%s --help' for more information.\n",
- p_this->p_vlc->psz_object_name );
+ p_this->p_libvlc->psz_object_name );
+ for( i_index = 0; p_longopts[i_index].name; i_index++ )
+ free( (char *)p_longopts[i_index].name );
free( p_longopts );
free( psz_shortopts );
return -1;
return 0;
}
+/**
+ * config_GetDataDir: find directory where shared data is installed
+ *
+ * @return a string (always succeeds).
+ */
+const char *config_GetDataDir( const vlc_object_t *p_this )
+{
+#if defined (WIN32) || defined (UNDER_CE)
+ return p_this->p_libvlc_global->psz_vlcpath;
+#elif defined(__APPLE__) || defined (SYS_BEOS)
+ static char path[PATH_MAX] = "";
+
+ if( *path == '\0' )
+ {
+ snprintf( path, sizeof( path ), "%s/share",
+ p_this->p_libvlc_global->psz_vlcpath );
+ path[sizeof( path ) - 1] = '\0';
+ }
+ return path;
+#else
+ return DATA_PATH;
+#endif
+}
+
/*****************************************************************************
- * config_GetHomeDir: find the user's home directory.
+ * config_GetHomeDir, config_GetUserDir: find the user's home directory.
*****************************************************************************
* This function will try by different ways to find the user's home path.
* Note that this function is not reentrant, it should be called only once
* at the beginning of main where the result will be stored for later use.
*****************************************************************************/
-char *config_GetHomeDir( void )
+static char *GetDir( vlc_bool_t b_appdata )
{
- char *p_tmp, *p_homedir = NULL;
+ char *psz_localhome = NULL;
#if defined(HAVE_GETPWUID)
struct passwd *p_pw = NULL;
#endif
-#if defined(WIN32) || defined(UNDER_CE)
+#if defined(WIN32) && !defined(UNDER_CE)
typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
- LPTSTR );
+ LPSTR );
+#ifndef CSIDL_FLAG_CREATE
# define CSIDL_FLAG_CREATE 0x8000
+#endif
+#ifndef CSIDL_APPDATA
# define CSIDL_APPDATA 0x1A
+#endif
+#ifndef CSIDL_PROFILE
+# define CSIDL_PROFILE 0x28
+#endif
+#ifndef SHGFP_TYPE_CURRENT
# define SHGFP_TYPE_CURRENT 0
+#endif
HINSTANCE shfolder_dll;
SHGETFOLDERPATH SHGetFolderPath ;
/* load the shfolder dll to retrieve SHGetFolderPath */
- if( ( shfolder_dll = LoadLibrary("shfolder.dll") ) != NULL )
+ if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL )
{
SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
- "SHGetFolderPathA" );
+ _T("SHGetFolderPathA") );
if ( SHGetFolderPath != NULL )
{
- p_homedir = (char *)malloc( MAX_PATH );
- if( !p_homedir )
- {
- return NULL;
- }
+ char psz_ACPhome[MAX_PATH];
/* get the "Application Data" folder for the current user */
if( S_OK == SHGetFolderPath( NULL,
- CSIDL_APPDATA | CSIDL_FLAG_CREATE,
+ (b_appdata ? CSIDL_APPDATA :
+ CSIDL_PROFILE) | CSIDL_FLAG_CREATE,
NULL, SHGFP_TYPE_CURRENT,
- p_homedir ) )
+ psz_ACPhome ) )
{
FreeLibrary( shfolder_dll );
- return p_homedir;
+ return FromLocaleDup( psz_ACPhome );
}
- free( p_homedir );
}
FreeLibrary( shfolder_dll );
}
+
+#elif defined(UNDER_CE)
+
+#ifndef CSIDL_APPDATA
+# define CSIDL_APPDATA 0x1A
+#endif
+
+ wchar_t p_whomedir[MAX_PATH];
+
+ /* get the "Application Data" folder for the current user */
+ if( SHGetSpecialFolderPath( NULL, p_whomedir, CSIDL_APPDATA, 1 ) )
+ {
+ char psz_ACPhome[2 * MAX_PATH];
+
+ sprintf( psz_ACPhome, "%ls", p_whomedir );
+ return FromLocaleDup( psz_ACPhome );
+ }
#endif
#if defined(HAVE_GETPWUID)
if( ( p_pw = getpwuid( getuid() ) ) == NULL )
#endif
{
- if( ( p_tmp = getenv( "HOME" ) ) == NULL )
+ psz_localhome = getenv( "HOME" );
+ if( psz_localhome == NULL )
{
- if( ( p_tmp = getenv( "TMP" ) ) == NULL )
- {
- p_tmp = "/tmp";
- }
+ psz_localhome = getenv( "TMP" );
+ if( psz_localhome == NULL )
+ psz_localhome = "/tmp";
}
-
- p_homedir = strdup( p_tmp );
}
#if defined(HAVE_GETPWUID)
else
- {
- p_homedir = strdup( p_pw->pw_dir );
- }
+ psz_localhome = p_pw->pw_dir;
#endif
- return p_homedir;
+ return FromLocaleDup( psz_localhome );
+}
+
+char *config_GetHomeDir( void )
+{
+ return GetDir( VLC_TRUE );
+}
+
+char *config_GetUserDir( void )
+{
+ return GetDir( VLC_FALSE );
}
char *psz_parser = strchr( psz_key, '-' );
while( psz_parser && psz_parser != psz_key )
{
- for( i = 0; i < sizeof(modifiers) / sizeof(key_descriptor_t); i++ )
+ for( i = 0; i < sizeof(vlc_modifiers) / sizeof(key_descriptor_t); i++ )
{
- if( !strncasecmp( modifiers[i].psz_key_string, psz_key,
- strlen( modifiers[i].psz_key_string ) ) )
+ if( !strncasecmp( vlc_modifiers[i].psz_key_string, psz_key,
+ strlen( vlc_modifiers[i].psz_key_string ) ) )
{
- i_key |= modifiers[i].i_key_code;
+ i_key |= vlc_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++ )
+ for( i = 0; i < sizeof(vlc_keys) / sizeof( key_descriptor_t ); i++ )
{
- if( !strcasecmp( keys[i].psz_key_string, psz_key ) )
+ if( !strcasecmp( vlc_keys[i].psz_key_string, psz_key ) )
{
- i_key |= keys[i].i_key_code;
+ i_key |= vlc_keys[i].i_key_code;
break;
}
}
}
*psz_key = '\0';
p = psz_key;
- for( index = 0; index < (sizeof(modifiers) / sizeof(key_descriptor_t));
+ for( index = 0; index < (sizeof(vlc_modifiers) / sizeof(key_descriptor_t));
index++ )
{
- if( i_key & modifiers[index].i_key_code )
+ if( i_key & vlc_modifiers[index].i_key_code )
{
- p += sprintf( p, "%s-", modifiers[index].psz_key_string );
+ p += sprintf( p, "%s-", vlc_modifiers[index].psz_key_string );
}
}
- for( index = 0; index < (sizeof(keys) / sizeof( key_descriptor_t));
+ for( index = 0; index < (sizeof(vlc_keys) / sizeof( key_descriptor_t));
index++)
{
- if( (int)( i_key & ~KEY_MODIFIER ) == keys[index].i_key_code )
+ if( (int)( i_key & ~KEY_MODIFIER ) == vlc_keys[index].i_key_code )
{
- p += sprintf( p, "%s", keys[index].psz_key_string );
+ p += sprintf( p, "%s", vlc_keys[index].psz_key_string );
break;
}
}
projects / vlc / blobdiff