* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include "../libvlc.h"
-#include "vlc_keys.h"
-#include "vlc_charset.h"
-
-#include <errno.h> /* errno */
-
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h> /* getuid() */
-#endif
-
-#ifdef HAVE_GETOPT_LONG
-# ifdef HAVE_GETOPT_H
-# include <getopt.h> /* getopt() */
-# endif
-#else
-# include "../extras/getopt.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#if defined(HAVE_GETPWUID)
-# include <pwd.h> /* getpwuid() */
-#endif
+#include <vlc_common.h>
+#include "vlc_keys.h"
+#include "vlc_charset.h"
+#include "vlc_configuration.h"
-#if defined( HAVE_SYS_STAT_H )
-# include <sys/stat.h>
-#endif
-#if defined( HAVE_SYS_TYPES_H )
-# include <sys/types.h>
-#endif
-#if defined( WIN32 )
-# if !defined( UNDER_CE )
-# include <direct.h>
-# endif
-#include <tchar.h>
-#endif
+#include <assert.h>
-#include "config.h"
+#include "configuration.h"
#include "modules/modules.h"
static inline char *strdupnull (const char *src)
return src ? strdup (src) : NULL;
}
-static inline char *_strdupnull (const char *src)
-{
- return src ? strdup (_(src)) : NULL;
-}
-
/* Item types that use a string value (i.e. serialized in the module cache) */
int IsConfigStringType (int type)
{
{
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 */
else
p_config->value.psz = NULL;
- p_config->b_dirty = VLC_TRUE;
+ p_config->b_dirty = true;
val.psz_string = (char *)p_config->value.psz;
}
/* free old string */
- if( oldval.psz_string ) free( oldval.psz_string );
+ free( oldval.psz_string );
}
/*****************************************************************************
p_config->value.i = i_value;
}
- p_config->b_dirty = VLC_TRUE;
+ p_config->b_dirty = true;
val.i_int = p_config->value.i;
p_config->value.f = f_value;
}
- p_config->b_dirty = VLC_TRUE;
+ p_config->b_dirty = true;
val.f_float = p_config->value.f;
*****************************************************************************
* 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 )
{
- 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( &p_this->p_libvlc->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( &p_this->p_libvlc->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
+ module_list_free (list);
}
-
-/*****************************************************************************
- * 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.
- *****************************************************************************/
-static char *GetDir( vlc_bool_t b_appdata )
-{
- const char *psz_localhome = NULL;
-
-#if defined(WIN32) && !defined(UNDER_CE)
- typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
- LPWSTR );
-#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( _T("SHFolder.dll") ) ) != NULL )
- {
- SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
- _T("SHGetFolderPathW") );
- if ( SHGetFolderPath != NULL )
- {
- 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,
- whomedir ) )
- {
- FreeLibrary( shfolder_dll );
- return FromWide( whomedir );
- }
- }
- FreeLibrary( shfolder_dll );
- }
-
-#elif defined(UNDER_CE)
-
-#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 );
-#endif
-
- psz_localhome = getenv( "HOME" );
- if( psz_localhome == NULL )
- {
-#if defined(HAVE_GETPWUID)
- struct passwd *p_pw;
- (void)b_appdata;
-
- if( ( p_pw = getpwuid( getuid() ) ) != NULL )
- psz_localhome = p_pw->pw_dir;
- else
-#endif
- {
- 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( VLC_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 );
-char *config_GetUserDir( void )
-{
- return GetDir( VLC_TRUE );
-}
-
-/**
- * Get the user's VLC configuration directory
- */
-char *config_GetConfigDir( libvlc_int_t *p_libvlc )
-{
- char *psz_dir;
-#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS)
- char *psz_parent = config_GetUserDir();
- if( !psz_parent ) psz_parent = p_libvlc->psz_homedir;
- if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 )
- return NULL;
- return psz_dir;
-#else
- /* XDG Base Directory Specification - Version 0.6 */
- char *psz_env = getenv( "XDG_CONFIG_HOME" );
- if( psz_env )
- {
- if( asprintf( &psz_dir, "%s/vlc", psz_env ) == -1 )
- return NULL;
- return psz_dir;
- }
- psz_env = getenv( "HOME" );
- if( !psz_env ) psz_env = p_libvlc->psz_homedir; /* not part of XDG spec but we want a sensible fallback */
- if( asprintf( &psz_dir, "%s/.config/vlc", psz_env ) == -1 )
- return NULL;
- return psz_dir;
-#endif
-}
-
-/**
- * Get the user's VLC data directory
- * (used for stuff like the skins, custom lua modules, ...)
- */
-char *config_GetUserDataDir( libvlc_int_t *p_libvlc )
-{
- char *psz_dir;
-#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS)
- char *psz_parent = config_GetUserDir();
- if( !psz_parent ) psz_parent = p_libvlc->psz_homedir;
- if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 )
- return NULL;
- return psz_dir;
-#else
- /* XDG Base Directory Specification - Version 0.6 */
- char *psz_env = getenv( "XDG_DATA_HOME" );
- if( psz_env )
- {
- if( asprintf( &psz_dir, "%s/vlc", psz_env ) == -1 )
- return NULL;
- return psz_dir;
- }
- psz_env = getenv( "HOME" );
- if( !psz_env ) psz_env = p_libvlc->psz_homedir; /* not part of XDG spec but we want a sensible fallback */
- if( asprintf( &psz_dir, "%s/.local/share/vlc", psz_env ) == -1 )
- return NULL;
- return psz_dir;
-#endif
-}
-
-/**
- * Get the user's VLC cache directory
- * (used for stuff like the modules cache, the album art cache, ...)
- */
-char *config_GetCacheDir( libvlc_int_t *p_libvlc )
-{
- char *psz_dir;
-#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS)
- char *psz_parent = config_GetUserDir();
- if( !psz_parent ) psz_parent = p_libvlc->psz_homedir;
- if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 )
- return NULL;
- return psz_dir;
-#else
- /* XDG Base Directory Specification - Version 0.6 */
- char *psz_env = getenv( "XDG_CACHE_HOME" );
- if( psz_env )
- {
- if( asprintf( &psz_dir, "%s/vlc", psz_env ) == -1 )
- return NULL;
- return psz_dir;
- }
- psz_env = getenv( "HOME" );
- if( !psz_env ) psz_env = p_libvlc->psz_homedir; /* not part of XDG spec but we want a sensible fallback */
- if( asprintf( &psz_dir, "%s/.cache/vlc", psz_env ) == -1 )
- return NULL;
- return psz_dir;
-#endif
-}
-
-/* Adds an extra interface to the configuration */
-void __config_AddIntf( vlc_object_t *p_this, const char *psz_intf )
-{
- assert( psz_intf );
-
- char *psz_config, *psz_parser;
- size_t i_len = strlen( psz_intf );
-
- psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "control" );
- while( psz_parser )
- {
- if( !strncmp( psz_intf, psz_parser, i_len ) )
- {
- free( psz_config );
- return;
- }
- psz_parser = strchr( psz_parser, ':' );
- if( psz_parser ) psz_parser++; /* skip the ':' */
- }
- free( psz_config );
-
- psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "extraintf" );
- while( psz_parser )
- {
- if( !strncmp( psz_intf, psz_parser, i_len ) )
- {
- free( psz_config );
- return;
- }
- psz_parser = strchr( psz_parser, ':' );
- if( psz_parser ) psz_parser++; /* skip the ':' */
- }
-
- /* interface not found in the config, let's add it */
- if( psz_config && strlen( psz_config ) > 0 )
- {
- char *psz_newconfig;
- if( asprintf( &psz_newconfig, "%s:%s", psz_config, psz_intf ) != -1 )
- {
- config_PutPsz( p_this->p_libvlc, "extraintf", psz_newconfig );
- free( psz_newconfig );
- }
- }
- else
- config_PutPsz( p_this->p_libvlc, "extraintf", psz_intf );
-
- free( psz_config );
-}
-
-/* Removes an extra interface from the configuration */
-void __config_RemoveIntf( vlc_object_t *p_this, const char *psz_intf )
-{
- assert( psz_intf );
-
- char *psz_config, *psz_parser;
- size_t i_len = strlen( psz_intf );
-
- psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "extraintf" );
- while( psz_parser )
- {
- if( !strncmp( psz_intf, psz_parser, i_len ) )
- {
- char *psz_newconfig;
- char *psz_end = psz_parser + i_len;
- if( *psz_end == ':' ) psz_end++;
- *psz_parser = '\0';
- if( asprintf( &psz_newconfig, "%s%s", psz_config, psz_end ) != -1 )
- {
- config_PutPsz( p_this->p_libvlc, "extraintf", psz_newconfig );
- free( psz_newconfig );
- }
- break;
- }
- psz_parser = strchr( psz_parser, ':' );
- if( psz_parser ) psz_parser++; /* skip the ':' */
- }
- free( psz_config );
-
- psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "control" );
- while( psz_parser )
- {
- if( !strncmp( psz_intf, psz_parser, i_len ) )
- {
- char *psz_newconfig;
- char *psz_end = psz_parser + i_len;
- if( *psz_end == ':' ) psz_end++;
- *psz_parser = '\0';
- if( asprintf( &psz_newconfig, "%s%s", psz_config, psz_end ) != -1 )
- {
- config_PutPsz( p_this->p_libvlc, "control", psz_newconfig );
- free( psz_newconfig );
- }
- break;
- }
- psz_parser = strchr( psz_parser, ':' );
- if( psz_parser ) psz_parser++; /* skip the ':' */
- }
- free( psz_config );
-}
-
-/*
- * Returns VLC_TRUE if the specified extra interface is present in the
- * configuration, VLC_FALSE if not
- */
-vlc_bool_t __config_ExistIntf( vlc_object_t *p_this, const char *psz_intf )
-{
- assert( psz_intf );
-
- char *psz_config, *psz_parser;
- size_t i_len = strlen( psz_intf );
-
- psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "extraintf" );
- while( psz_parser )
- {
- if( !strncmp( psz_parser, psz_intf, i_len ) )
- {
- free( psz_config );
- return VLC_TRUE;
- }
- psz_parser = strchr( psz_parser, ':' );
- if( psz_parser ) psz_parser++; /* skip the ':' */
- }
- free( psz_config );
-
- psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "control" );
- while( psz_parser )
- {
- if( !strncmp( psz_parser, psz_intf, i_len ) )
- {
- free( psz_config );
- return VLC_TRUE;
- }
- psz_parser = strchr( psz_parser, ':' );
- if( psz_parser ) psz_parser++; /* skip the ':' */
- }
- free( psz_config );
-
- return VLC_FALSE;
-}
-
projects / vlc / blobdiff