#include <string.h> /* strdup() */
#include <errno.h> /* errno */
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* getuid() */
#endif
#include <tchar.h>
#endif
-
static int ConfigStringToKey( char * );
static char *ConfigKeyToString( int );
* this module might be unloaded from memory at any time (remember HideModule).
* This is why we need to create an exact copy of the config data.
*****************************************************************************/
-void config_Duplicate( module_t *p_module, module_config_t *p_orig )
+void config_Duplicate( module_t *p_module, const module_config_t *p_orig )
{
int i, j, i_lines = 1;
module_config_t *p_item;
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 = 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_FLOAT:
if( !*psz_option_value )
break; /* ignore empty option */
- p_item->f_value = (float)atof( psz_option_value);
+ 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",
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 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;
}
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_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;
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, "[%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" );
/* Ignore deprecated options */
if( p_item->psz_current )
continue;
+ if( p_item->b_unsaveable )
+ /*obvious*/
+ continue;
+
if( b_autosave && !p_item->b_autosave )
{
i_value = p_item->i_value_saved;
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( i_value == p_item->i_value_orig )
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") );
if( i_value == p_item->i_value_orig )
fprintf( file, "#" );
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( f_value == p_item->f_value_orig )
fprintf( file, "#" );
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( (!psz_value && !p_item->psz_value_orig) ||
(psz_value && p_item->psz_value_orig &&
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 i_index, i_count;
/* Check if there's anything to save */
- 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 );
i_count = p_list->i_count;
for( i_index = 0; i_index < i_count; i_index++ )
if( p_item->i_type != CONFIG_HINT_END ) break;
}
vlc_list_release( p_list );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
if( i_index == i_count ) return VLC_SUCCESS;
return SaveConfigFile( p_this, 0, VLC_TRUE );
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 __APPLE__
- /* When vlc.app is run by double clicking in Mac OS X, the 2nd arg
+ /* 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 *) );
}
p_conf = config_FindConfig( p_this, psz_name );
}
- switch( p_conf->i_type )
+ 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 */
+ if( pp_shortopts[i_cmd] != NULL )
+ {
+ switch( pp_shortopts[i_cmd]->i_type )
{
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:
- case CONFIG_ITEM_MODULE_CAT:
- config_PutPsz( p_this, psz_name, optarg );
+ config_PutPsz( p_this, pp_shortopts[i_cmd]->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 */
- if( pp_shortopts[i_cmd] != NULL )
- {
- switch( pp_shortopts[i_cmd]->i_type )
- {
- 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 )
+ 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,
- strtol(optarg, 0, 0) );
- }
- 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;
{
fprintf( stderr, "%s: unknown option"
" or missing mandatory argument ",
- p_this->p_vlc->psz_object_name );
+ 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 );
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, config_GetUserDir: find the user's home directory.
*****************************************************************************
*****************************************************************************/
static char *GetDir( vlc_bool_t b_appdata )
{
- char *psz_localhome = NULL;
+ const char *psz_localhome = NULL;
#if defined(HAVE_GETPWUID)
struct passwd *p_pw = NULL;
#if defined(WIN32) && !defined(UNDER_CE)
typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
- LPSTR );
+ LPWSTR );
#ifndef CSIDL_FLAG_CREATE
# define CSIDL_FLAG_CREATE 0x8000
#endif
if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL )
{
SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
- _T("SHGetFolderPathA") );
+ _T("SHGetFolderPathW") );
if ( SHGetFolderPath != NULL )
{
- char psz_ACPhome[MAX_PATH];
+ wchar_t whomedir[MAX_PATH];
/* get the "Application Data" folder for the current user */
if( S_OK == SHGetFolderPath( NULL,
(b_appdata ? CSIDL_APPDATA :
CSIDL_PROFILE) | CSIDL_FLAG_CREATE,
NULL, SHGFP_TYPE_CURRENT,
- psz_ACPhome ) )
+ whomedir ) )
{
FreeLibrary( shfolder_dll );
- return FromLocaleDup( psz_ACPhome );
+ return FromWide( whomedir );
}
}
FreeLibrary( shfolder_dll );
# define CSIDL_APPDATA 0x1A
#endif
- wchar_t p_whomedir[MAX_PATH];
+ wchar_t 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( p_ACPhome );
- }
+ if( SHGetSpecialFolderPath( NULL, whomedir, CSIDL_APPDATA, 1 ) )
+ return FromWide( whomedir );
#endif
#if defined(HAVE_GETPWUID)