# include "config.h"
#endif
-#if defined( WIN32 )
-# if !defined( UNDER_CE )
-# define _WIN32_IE IE5
-# include <w32api.h>
-# include <direct.h>
-# include <shlobj.h>
-# endif
-# include <tchar.h>
-#endif
-
-#include <vlc/vlc.h>
-#include "../libvlc.h"
+#include <vlc_common.h>
#include "vlc_keys.h"
-#include "vlc_charset.h"
#include "vlc_configuration.h"
-#include <errno.h> /* errno */
#include <assert.h>
-#include <limits.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h> /* getuid() */
-#endif
-
-#if defined(HAVE_GETPWUID_R)
-# include <pwd.h>
-#endif
-
-#if defined( HAVE_SYS_STAT_H )
-# include <sys/stat.h>
-#endif
-#if defined( HAVE_SYS_TYPES_H )
-# include <sys/types.h>
-#endif
#include "configuration.h"
#include "modules/modules.h"
+vlc_rwlock_t config_lock;
+
static inline char *strdupnull (const char *src)
{
return src ? strdup (src) : NULL;
{
CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE,
CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_MODULE_CAT, CONFIG_ITEM_PASSWORD,
- CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT
+ CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT, CONFIG_ITEM_FONT
};
/* NOTE: this needs to be changed if we ever get more than 255 types */
return memchr (config_types, type, sizeof (config_types)) != NULL;
}
-
+#undef config_GetType
/*****************************************************************************
* 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 )
+int config_GetType( vlc_object_t *p_this, const char *psz_name )
{
module_config_t *p_config;
int i_type;
return i_type;
}
+#undef config_GetInt
/*****************************************************************************
* config_GetInt: get the value of an int variable
*****************************************************************************
* represented by an integer (CONFIG_ITEM_INTEGER and
* CONFIG_ITEM_BOOL).
*****************************************************************************/
-int __config_GetInt( vlc_object_t *p_this, const char *psz_name )
+int64_t config_GetInt( vlc_object_t *p_this, const char *psz_name )
{
module_config_t *p_config;
return -1;
}
- return p_config->value.i;
+ int64_t val;
+
+ vlc_rwlock_rdlock (&config_lock);
+ val = p_config->value.i;
+ vlc_rwlock_unlock (&config_lock);
+ return val;
}
+#undef config_GetFloat
/*****************************************************************************
* config_GetFloat: get the value of a float variable
*****************************************************************************
* This function is used to get the value of variables which are internally
* represented by a float (CONFIG_ITEM_FLOAT).
*****************************************************************************/
-float __config_GetFloat( vlc_object_t *p_this, const char *psz_name )
+float config_GetFloat( vlc_object_t *p_this, const char *psz_name )
{
module_config_t *p_config;
return -1;
}
- return p_config->value.f;
+ float val;
+
+ vlc_rwlock_rdlock (&config_lock);
+ val = p_config->value.f;
+ vlc_rwlock_unlock (&config_lock);
+ return val;
}
+#undef config_GetPsz
/*****************************************************************************
* config_GetPsz: get the string value of a string variable
*****************************************************************************
* duplicate of the actual value. It isn't safe to return a pointer to the
* actual value as it can be modified at any time.
*****************************************************************************/
-char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name )
+char * config_GetPsz( vlc_object_t *p_this, const char *psz_name )
{
module_config_t *p_config;
}
/* return a copy of the string */
- vlc_mutex_lock( p_config->p_lock );
+ vlc_rwlock_rdlock (&config_lock);
char *psz_value = strdupnull (p_config->value.psz);
- vlc_mutex_unlock( p_config->p_lock );
+ vlc_rwlock_unlock (&config_lock);
return psz_value;
}
+#undef config_PutPsz
/*****************************************************************************
* config_PutPsz: set the string value of a string variable
*****************************************************************************
* represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE,
* CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_PASSWORD, 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;
+ vlc_value_t oldval;
p_config = config_FindConfig( p_this, psz_name );
return;
}
- vlc_mutex_lock( p_config->p_lock );
+ char *str;
+ if ((psz_value != NULL) && *psz_value)
+ str = strdup (psz_value);
+ else
+ str = NULL;
+ vlc_rwlock_wrlock (&config_lock);
/* backup old value */
oldval.psz_string = (char *)p_config->value.psz;
- if ((psz_value != NULL) && *psz_value)
- p_config->value.psz = strdup (psz_value);
- else
- p_config->value.psz = NULL;
-
+ p_config->value.psz = str;
p_config->b_dirty = true;
-
- val.psz_string = (char *)p_config->value.psz;
-
- vlc_mutex_unlock( p_config->p_lock );
+ vlc_rwlock_unlock (&config_lock);
if( p_config->pf_callback )
{
+ vlc_value_t val;
+
+ val.psz_string = (char *)psz_value;
p_config->pf_callback( p_this, psz_name, oldval, val,
p_config->p_callback_data );
}
free( oldval.psz_string );
}
+#undef config_PutInt
/*****************************************************************************
* config_PutInt: set the integer value of an int variable
*****************************************************************************
* represented by an integer (CONFIG_ITEM_INTEGER and
* CONFIG_ITEM_BOOL).
*****************************************************************************/
-void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
+void config_PutInt( vlc_object_t *p_this, const char *psz_name,
+ int64_t i_value )
{
module_config_t *p_config;
- vlc_value_t oldval, val;
+ vlc_value_t oldval;
p_config = config_FindConfig( p_this, psz_name );
return;
}
+ if (i_value < p_config->min.i)
+ i_value = p_config->min.i;
+ if (i_value > p_config->max.i)
+ i_value = p_config->max.i;
+
+ vlc_rwlock_wrlock (&config_lock);
/* backup old value */
oldval.i_int = p_config->value.i;
- /* if i_min == i_max == 0, then do not use them */
- if ((p_config->min.i == 0) && (p_config->max.i == 0))
- {
- p_config->value.i = i_value;
- }
- else if (i_value < p_config->min.i)
- {
- p_config->value.i = p_config->min.i;
- }
- else if (i_value > p_config->max.i)
- {
- p_config->value.i = p_config->max.i;
- }
- else
- {
- p_config->value.i = i_value;
- }
-
+ p_config->value.i = i_value;
p_config->b_dirty = true;
-
- val.i_int = p_config->value.i;
+ vlc_rwlock_unlock (&config_lock);
if( p_config->pf_callback )
{
+ vlc_value_t val;
+
+ val.i_int = i_value;
p_config->pf_callback( p_this, psz_name, oldval, val,
p_config->p_callback_data );
}
}
+#undef config_PutFloat
/*****************************************************************************
* config_PutFloat: set the value of a float variable
*****************************************************************************
* This function is used to set the value of variables which are internally
* represented by a float (CONFIG_ITEM_FLOAT).
*****************************************************************************/
-void __config_PutFloat( vlc_object_t *p_this,
- const char *psz_name, float f_value )
+void config_PutFloat( vlc_object_t *p_this,
+ const char *psz_name, float f_value )
{
module_config_t *p_config;
- vlc_value_t oldval, val;
+ vlc_value_t oldval;
p_config = config_FindConfig( p_this, psz_name );
return;
}
- /* backup old value */
- oldval.f_float = p_config->value.f;
-
/* if f_min == f_max == 0, then do not use them */
if ((p_config->min.f == 0) && (p_config->max.f == 0))
- {
- p_config->value.f = f_value;
- }
+ ;
else if (f_value < p_config->min.f)
- {
- p_config->value.f = p_config->min.f;
- }
+ f_value = p_config->min.f;
else if (f_value > p_config->max.f)
- {
- p_config->value.f = p_config->max.f;
- }
- else
- {
- p_config->value.f = f_value;
- }
+ f_value = p_config->max.f;
- p_config->b_dirty = true;
+ vlc_rwlock_wrlock (&config_lock);
+ /* backup old value */
+ oldval.f_float = p_config->value.f;
- val.f_float = p_config->value.f;
+ p_config->value.f = f_value;
+ p_config->b_dirty = true;
+ vlc_rwlock_unlock (&config_lock);
if( p_config->pf_callback )
{
+ vlc_value_t val;
+
+ val.f_float = f_value;
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 )
+static int confcmp (const void *a, const void *b)
+{
+ const module_config_t *const *ca = a, *const *cb = b;
+
+ return strcmp ((*ca)->psz_name, (*cb)->psz_name);
+}
+
+static int confnamecmp (const void *key, const void *elem)
+{
+ const module_config_t *const *conf = elem;
+
+ return strcmp (key, (*conf)->psz_name);
+}
+
+static struct
{
- vlc_list_t *p_list;
- int i_index;
+ module_config_t **list;
+ size_t count;
+} config = { NULL, 0 };
- if( !psz_name ) return NULL;
+/**
+ * Index the configuration items by name for faster lookups.
+ */
+int config_SortConfig (void)
+{
+ size_t nmod;
+ module_t **mlist = module_list_get (&nmod);
+ if (unlikely(mlist == NULL))
+ return VLC_ENOMEM;
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ size_t nconf = 0;
+ for (size_t i = 0; i < nmod; i++)
+ nconf += mlist[i]->confsize;
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ module_config_t **clist = malloc (sizeof (*clist) * nconf);
+ if (unlikely(clist == NULL))
{
- module_config_t *p_item, *p_end;
- module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object;
+ module_list_free (mlist);
+ return VLC_ENOMEM;
+ }
- if( !p_parser->i_config_items )
- continue;
+ nconf = 0;
+ for (size_t i = 0; i < nmod; i++)
+ {
+ module_t *parser = mlist[i];
+ module_config_t *item, *end;
- for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize;
- p_item < p_end;
- p_item++ )
+ for (item = parser->p_config, end = item + parser->confsize;
+ item < end;
+ item++)
{
- if( p_item->i_type & CONFIG_HINT )
- /* ignore hints */
- continue;
- if( !strcmp( psz_name, p_item->psz_name )
- || ( p_item->psz_oldname
- && !strcmp( psz_name, p_item->psz_oldname ) ) )
- {
- vlc_list_release( p_list );
- return p_item;
- }
+ if (item->i_type & CONFIG_HINT)
+ continue; /* ignore hints */
+ clist[nconf++] = item;
}
}
+ module_list_free (mlist);
+
+ qsort (clist, nconf, sizeof (*clist), confcmp);
+
+ config.list = clist;
+ config.count = nconf;
+ return VLC_SUCCESS;
+}
+
+void config_UnsortConfig (void)
+{
+ module_config_t **clist;
+
+ clist = config.list;
+ config.list = NULL;
+ config.count = 0;
+
+ free (clist);
+}
+
+/*****************************************************************************
+ * config_FindConfig: find the config structure associated with an option.
+ *****************************************************************************
+ * FIXME: remove p_this pointer parameter (or use it)
+ *****************************************************************************/
+module_config_t *config_FindConfig (vlc_object_t *p_this, const char *name)
+{
+ VLC_UNUSED(p_this);
- vlc_list_release( p_list );
+ if (unlikely(name == NULL))
+ return NULL;
- return NULL;
+ module_config_t *const *p;
+ p = bsearch (name, config.list, config.count, sizeof (*p), confnamecmp);
+ return p ? *p : NULL;
}
/*****************************************************************************
p_module->p_config = NULL;
}
-/*****************************************************************************
- * config_SetCallbacks: sets callback functions in the duplicate p_config.
- *****************************************************************************
- * Unfortunatly we cannot work directly with the module's config data as
- * this module might be unloaded from memory at any time (remember HideModule).
- * This is why we need to duplicate callbacks each time we reload the module.
- *****************************************************************************/
-void config_SetCallbacks( module_config_t *p_new, module_config_t *p_orig,
- size_t n )
-{
- for (size_t i = 0; i < n; i++)
- {
- p_new->pf_callback = p_orig->pf_callback;
- p_new++;
- p_orig++;
- }
-}
-
-/*****************************************************************************
- * config_UnsetCallbacks: unsets callback functions in the duplicate p_config.
- *****************************************************************************
- * We simply undo what we did in config_SetCallbacks.
- *****************************************************************************/
-void config_UnsetCallbacks( module_config_t *p_new, size_t n )
-{
- for (size_t i = 0; i < n; i++)
- {
- p_new->pf_callback = NULL;
- p_new++;
- }
-}
-
+#undef config_ResetAll
/*****************************************************************************
* config_ResetAll: reset the configuration data for all the modules.
*****************************************************************************/
-void __config_ResetAll( vlc_object_t *p_this )
+void config_ResetAll( vlc_object_t *p_this )
{
- libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
- int i_index;
- vlc_list_t *p_list;
+ VLC_UNUSED(p_this);
module_t *p_module;
+ module_t **list = module_list_get (NULL);
- /* Acquire config file lock */
- vlc_mutex_lock( &priv->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++ )
+ vlc_rwlock_wrlock (&config_lock);
+ for (size_t j = 0; (p_module = list[j]) != NULL; j++)
{
- p_module = (module_t *)p_list->p_values[i_index].p_object ;
if( p_module->b_submodule ) continue;
for (size_t i = 0; i < p_module->confsize; i++ )
{
- if (IsConfigIntegerType (p_module->p_config[i].i_type))
- p_module->p_config[i].value.i = p_module->p_config[i].orig.i;
+ module_config_t *p_config = p_module->p_config + i;
+
+ if (IsConfigIntegerType (p_config->i_type))
+ p_config->value.i = p_config->orig.i;
else
- if (IsConfigFloatType (p_module->p_config[i].i_type))
- p_module->p_config[i].value.f = p_module->p_config[i].orig.f;
+ if (IsConfigFloatType (p_config->i_type))
+ p_config->value.f = p_config->orig.f;
else
- if (IsConfigStringType (p_module->p_config[i].i_type))
+ if (IsConfigStringType (p_config->i_type))
{
- free ((char *)p_module->p_config[i].value.psz);
- p_module->p_config[i].value.psz =
- strdupnull (p_module->p_config[i].orig.psz);
+ free ((char *)p_config->value.psz);
+ p_config->value.psz =
+ strdupnull (p_config->orig.psz);
}
}
}
+ vlc_rwlock_unlock (&config_lock);
- vlc_list_release( p_list );
- vlc_mutex_unlock( &priv->config_lock );
-}
-
-/**
- * config_GetDataDir: find directory where shared data is installed
- *
- * @return a string (always succeeds).
- */
-const char *config_GetDataDir( void )
-{
-#if defined (WIN32) || defined (UNDER_CE)
- return vlc_global()->psz_vlcpath;
-#elif defined(__APPLE__) || defined (SYS_BEOS)
- static char path[PATH_MAX] = "";
-
- if( *path == '\0' )
- {
- snprintf( path, sizeof( path ), "%s/share",
- vlc_global()->psz_vlcpath );
- path[sizeof( path ) - 1] = '\0';
- }
- return path;
-#else
- return DATA_PATH;
-#endif
-}
-
-static char *GetDir( bool b_appdata )
-{
- const char *psz_localhome = NULL;
-
-#if defined(WIN32) && !defined(UNDER_CE)
- wchar_t whomedir[MAX_PATH];
- /* Get the "Application Data" folder for the current user */
- if( S_OK == SHGetFolderPathW( NULL,
- (b_appdata ? CSIDL_APPDATA : CSIDL_PROFILE) | CSIDL_FLAG_CREATE,
- NULL, SHGFP_TYPE_CURRENT, whomedir ) )
- return FromWide( whomedir );
-
-#elif defined(UNDER_CE)
- (void)b_appdata;
-#ifndef CSIDL_APPDATA
-# define CSIDL_APPDATA 0x1A
-#endif
-
- wchar_t whomedir[MAX_PATH];
-
- /* get the "Application Data" folder for the current user */
- if( SHGetSpecialFolderPath( NULL, whomedir, CSIDL_APPDATA, 1 ) )
- return FromWide( whomedir );
-#else
- (void)b_appdata;
-#endif
-
- psz_localhome = getenv( "HOME" );
-#if defined(HAVE_GETPWUID_R)
- char buf[sysconf (_SC_GETPW_R_SIZE_MAX)];
- if( psz_localhome == NULL )
- {
- struct passwd pw, *res;
-
- if (!getpwuid_r (getuid (), &pw, buf, sizeof (buf), &res) && res)
- psz_localhome = pw.pw_dir;
- }
-#endif
- if (psz_localhome == NULL)
- psz_localhome = getenv( "TMP" );
- if (psz_localhome == NULL)
- psz_localhome = "/tmp";
-
- return FromLocaleDup( psz_localhome );
-}
-
-/**
- * Get the user's home directory
- */
-char *config_GetHomeDir( void )
-{
- return GetDir( false );
-}
-
-/**
- * Get the user's main data and config directory:
- * - on windows that's the App Data directory;
- * - on other OSes it's the same as the home directory.
- */
-char *config_GetUserDir( void ); /* XXX why does gcc wants a declaration ?
- * --funman */
-char *config_GetUserDir( void )
-{
- return GetDir( true );
-}
-
-static char *config_GetFooDir (const char *xdg_name, const char *xdg_default)
-{
- char *psz_dir;
-#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS)
- char *psz_parent = config_GetUserDir();
-
- if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 )
- psz_dir = NULL;
-
- free (psz_parent);
- (void)xdg_name; (void)xdg_default;
-#else
- char var[sizeof ("XDG__HOME") + strlen (xdg_name)];
-
- /* XDG Base Directory Specification - Version 0.6 */
- snprintf (var, sizeof (var), "XDG_%s_HOME", xdg_name);
- char *psz_home = getenv( var );
- psz_home = psz_home ? FromLocaleDup( psz_home ) : NULL;
- if( psz_home )
- {
- if( asprintf( &psz_dir, "%s/vlc", psz_home ) == -1 )
- psz_dir = NULL;
- goto out;
- }
-
- /* Try HOME, then fallback to non-XDG dirs */
- psz_home = config_GetHomeDir();
- if( asprintf( &psz_dir, "%s/%s/vlc", psz_home, xdg_default ) == -1 )
- psz_dir = NULL;
-
-out:
- free (psz_home);
-#endif
- return psz_dir;
-}
-
-/**
- * Get the user's VLC configuration directory
- */
-char *config_GetConfigDir( void )
-{
- return config_GetFooDir ("CONFIG", ".config");
-}
-
-/**
- * Get the user's VLC data directory
- * (used for stuff like the skins, custom lua modules, ...)
- */
-char *config_GetUserDataDir( void )
-{
- return config_GetFooDir ("DATA", ".local/share");
-}
-
-/**
- * Get the user's VLC cache directory
- * (used for stuff like the modules cache, the album art cache, ...)
- */
-char *config_GetCacheDir( void )
-{
- return config_GetFooDir ("CACHE", ".cache");
+ module_list_free (list);
}
projects / vlc / blobdiff