* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include "../libvlc.h"
#include "vlc_charset.h"
#include "vlc_keys.h"
#include <errno.h> /* errno */
-#include <stdbool.h>
-
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
+#include <assert.h>
+#include <limits.h>
+#ifdef __APPLE__
+# include <xlocale.h>
+#else
+#include <locale.h>
#endif
-#include "config.h"
+#include "configuration.h"
#include "modules/modules.h"
static char *ConfigKeyToString( int );
return src ? strdup (src) : NULL;
}
-static inline char *_strdupnull (const char *src)
+/**
+ * Get the user's configuration file
+ */
+static char *config_GetConfigFile( void )
{
- return src ? strdup (_(src)) : NULL;
-}
+ char *psz_dir = config_GetUserConfDir();
+ char *psz_configfile;
+ if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 )
+ psz_configfile = NULL;
+ free( psz_dir );
+ return psz_configfile;
+}
static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
{
- char *psz_filename = p_obj->p_libvlc->psz_configfile;
+ char *psz_filename = libvlc_priv (p_obj->p_libvlc)->psz_configfile;
FILE *p_stream;
if( !psz_filename )
{
- psz_filename = config_GetConfigFile( p_obj->p_libvlc );
+ psz_filename = config_GetConfigFile();
}
msg_Dbg( p_obj, "opening config file (%s)", psz_filename );
* Specification configs */
char *psz_old;
if( asprintf( &psz_old, "%s" DIR_SEP CONFIG_DIR DIR_SEP CONFIG_FILE,
- p_obj->p_libvlc->psz_homedir ) != -1 )
+ config_GetHomeDir() ) != -1 )
{
p_stream = utf8_fopen( psz_old, mode );
if( p_stream )
"VLC will now use %s.", psz_old, psz_filename );
char *psz_readme;
if( asprintf(&psz_readme,"%s"DIR_SEP CONFIG_DIR DIR_SEP"README",
- p_obj->p_libvlc->psz_homedir ) != -1 )
+ config_GetHomeDir() ) != -1 )
{
FILE *p_readme = utf8_fopen( psz_readme, "wt" );
if( p_readme )
{
- fputs( "The VLC media player configuration folder has "
- "moved to comply with the XDG Base "
- "Directory Specification version 0.6. Your "
- "configuration has been copied to the new "
- "location (", p_readme );
- fputs( p_obj->p_libvlc->psz_configdir, p_readme );
- fputs( "). You can delete this directory and "
- "all its contents.", p_readme );
+ fprintf( p_readme, "The VLC media player "
+ "configuration folder has moved to comply\n"
+ "with the XDG Base Directory Specification "
+ "version 0.6. Your\nconfiguration has been "
+ "copied to the new location:\n%s\nYou can "
+ "delete this directory and all its contents.",
+ psz_filename);
fclose( p_readme );
}
free( psz_readme );
#endif
else if( p_stream != NULL )
{
- p_obj->p_libvlc->psz_configfile = psz_filename;
+ libvlc_priv (p_obj->p_libvlc)->psz_configfile = psz_filename;
}
return p_stream;
*****************************************************************************/
int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
+ libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
vlc_list_t *p_list;
FILE *file;
return VLC_EGENERIC;
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_lock( &priv->config_lock );
/* Look for the selected module, if NULL then save everything */
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
char line[1024], section[1022];
section[0] = '\0';
+ /* Ensure consistent number formatting... */
+ locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
+ locale_t baseloc = uselocale (loc);
+
while (fgets (line, 1024, file) != NULL)
{
/* Ignore comments and empty lines */
case CONFIG_ITEM_FLOAT:
if( !*psz_option_value )
break; /* ignore empty option */
- p_item->value.f = (float)i18n_atof( psz_option_value);
+ p_item->value.f = (float)atof (psz_option_value);
p_item->saved.f = p_item->value.f;
break;
fclose (file);
vlc_list_release( p_list );
+ if (loc != (locale_t)0)
+ {
+ uselocale (baseloc);
+ freelocale (loc);
+ }
- vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_unlock( &priv->config_lock );
return 0;
}
*****************************************************************************/
int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname )
{
- if( !psz_dirname && !*psz_dirname ) return -1;
+ if( !psz_dirname || !*psz_dirname ) return -1;
if( utf8_mkdir( psz_dirname, 0700 ) == 0 )
return 0;
if (desc == NULL)
desc = "?";
- if (fprintf (file, "# %s (%s)\n%s%s=", desc, gettext (type),
+ if (fprintf (file, "# %s (%s)\n%s%s=", desc, _(type),
comment ? "#" : "", name) < 0)
return -1;
* Really stupid no ?
*****************************************************************************/
static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
- vlc_bool_t b_autosave )
+ bool b_autosave )
{
+ libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
module_t *p_parser;
vlc_list_t *p_list;
FILE *file;
char p_line[1024], *p_index2;
int i_sizebuf = 0;
char *p_bigbuffer, *p_index;
- vlc_bool_t b_backup;
+ bool b_backup;
int i_index;
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_lock( &priv->config_lock );
- if( p_this->p_libvlc->psz_configfile == NULL )
+ if( libvlc_priv (p_this->p_libvlc)->psz_configfile == NULL )
{
- const char *psz_configdir = p_this->p_libvlc->psz_configdir;
+ char *psz_configdir = config_GetUserConfDir();
if( !psz_configdir ) /* XXX: This should never happen */
{
msg_Err( p_this, "no configuration directory defined" );
- vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_unlock( &priv->config_lock );
return -1;
}
config_CreateDir( p_this, psz_configdir );
+ free( psz_configdir );
}
file = config_OpenConfigFile( p_this, "rt" );
p_bigbuffer = p_index = malloc( i_sizebuf+1 );
if( !p_bigbuffer )
{
- msg_Err( p_this, "out of memory" );
if( file ) fclose( file );
- vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_unlock( &priv->config_lock );
return -1;
}
p_bigbuffer[0] = 0;
{
vlc_list_release( p_list );
free( p_bigbuffer );
- vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_unlock( &priv->config_lock );
return -1;
}
fprintf( file, "\xEF\xBB\xBF###\n### " COPYRIGHT_MESSAGE "\n###\n\n"
- "###\n### lines begining with a '#' character are comments\n###\n\n" );
+ "###\n### lines beginning with a '#' character are comments\n###\n\n" );
+
+ /* Ensure consistent number formatting... */
+ locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
+ locale_t baseloc = uselocale (loc);
/* Look for the selected module, if NULL then save everything */
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
/* Do not save the new value in the configuration file
* if doing an autosave, and the item is not an "autosaved" one. */
- vlc_bool_t b_retain = b_autosave && !p_item->b_autosave;
+ bool b_retain = b_autosave && !p_item->b_autosave;
if ((p_item->i_type & CONFIG_HINT) /* ignore hint */
- || p_item->psz_current /* ignore deprecated option */
+ || p_item->b_removed /* ignore deprecated option */
|| p_item->b_unsaveable) /* ignore volatile option */
continue;
: (p_item->orig.psz != NULL);
config_Write (file, p_item->psz_text, N_("string"),
- modified, p_item->psz_name, "%s",
+ !modified, p_item->psz_name, "%s",
psz_value ? psz_value : "");
- if (b_retain)
- break;
+ if ( !b_retain )
+ {
- free ((char *)p_item->saved.psz);
- if( (psz_value && p_item->orig.psz &&
- strcmp( psz_value, p_item->orig.psz )) ||
- !psz_value || !p_item->orig.psz)
- p_item->saved.psz = strdupnull (psz_value);
- else
- p_item->saved.psz = NULL;
+ free ((char *)p_item->saved.psz);
+ if( (psz_value && p_item->orig.psz &&
+ strcmp( psz_value, p_item->orig.psz )) ||
+ !psz_value || !p_item->orig.psz)
+ p_item->saved.psz = strdupnull (psz_value);
+ else
+ p_item->saved.psz = NULL;
+ }
}
if (!b_retain)
- p_item->b_dirty = VLC_FALSE;
+ p_item->b_dirty = false;
}
}
vlc_list_release( p_list );
+ if (loc != (locale_t)0)
+ {
+ uselocale (baseloc);
+ freelocale (loc);
+ }
/*
* Restore old settings from the config in file
free( p_bigbuffer );
fclose( file );
- vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_unlock( &priv->config_lock );
return 0;
}
int config_AutoSaveConfigFile( vlc_object_t *p_this )
{
+ libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
vlc_list_t *p_list;
int i_index, i_count;
- if( !p_this ) return -1;
+ assert( p_this );
/* Check if there's anything to save */
- vlc_mutex_lock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_lock( &priv->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->b_autosave && p_item->b_dirty ) break;
}
- break;
+ if( p_item < p_end ) break;
}
vlc_list_release( p_list );
- vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
+ vlc_mutex_unlock( &priv->config_lock );
if( i_index == i_count ) return VLC_SUCCESS;
- return SaveConfigFile( p_this, 0, VLC_TRUE );
+ return SaveConfigFile( p_this, 0, true );
}
int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
- return SaveConfigFile( p_this, psz_module_name, VLC_FALSE );
-}
-
-/**
- * Get the user's configuration file
- */
-char *config_GetConfigFile( libvlc_int_t *p_libvlc )
-{
- char *psz_configfile;
- if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE,
- p_libvlc->psz_configdir ) == -1 )
- return NULL;
- return psz_configfile;
+ return SaveConfigFile( p_this, psz_module_name, false );
}
/**
{
/* This is incomplete: we should also support the ~cmassiot/ syntax */
char *psz_buf;
- if( asprintf( &psz_buf, "%s/%s", p_libvlc->psz_homedir,
+ if( asprintf( &psz_buf, "%s/%s", config_GetHomeDir(),
psz_configfile + 2 ) == -1 )
{
free( psz_configfile );
projects / vlc / blobdiff