# 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"
{
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 */
*****************************************************************************
* FIXME: This function really needs to be optimized.
* FIXME: And now even more.
+ * FIXME: remove p_this pointer parameter (or use it)
*****************************************************************************/
module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name )
{
- vlc_list_t *p_list;
- int i_index;
+ VLC_UNUSED(p_this);
+ module_t *p_parser;
if( !psz_name ) return NULL;
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ module_t **list = module_list_get (NULL);
+ if (list == NULL)
+ return NULL;
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ for (size_t i = 0; (p_parser = list[i]) != NULL; i++)
{
module_config_t *p_item, *p_end;
- module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object;
if( !p_parser->i_config_items )
continue;
|| ( p_item->psz_oldname
&& !strcmp( psz_name, p_item->psz_oldname ) ) )
{
- vlc_list_release( p_list );
+ module_list_free (list);
return p_item;
}
}
}
- vlc_list_release( p_list );
-
+ module_list_free (list);
return NULL;
}
*****************************************************************************/
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++ )
+ 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;
+
+ vlc_mutex_lock (p_config->p_lock);
+ 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_mutex_unlock (p_config->p_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 );
-}
-
-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 = GetDir (true);
-
- 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_GetUserConfDir( 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