config: On Mac OS use the app identifier for app dependent config dirs.

[vlc] / src / config / configuration.h

diff --git a/src/config/configuration.h b/src/config/configuration.h
index 9e5b6d5e03ff1112b59e30e556824a5305af4ef4..2e88f9981cc62b44acd898011216e0fdce1e614d 100644 (file)
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -42,15 +42,11 @@ void config_UnsetCallbacks( module_config_t *, size_t );
 #define config_LoadCmdLine(a,b,c,d) __config_LoadCmdLine(VLC_OBJECT(a),b,c,d)
 #define config_LoadConfigFile(a,b) __config_LoadConfigFile(VLC_OBJECT(a),b)
 
-int __config_LoadCmdLine   ( vlc_object_t *, int *, const char *[], vlc_bool_t );
-char *config_GetHomeDir    ( void );
-char *config_GetConfigDir  ( libvlc_int_t * );
-char *config_GetUserDataDir( libvlc_int_t * );
-char *config_GetCacheDir   ( libvlc_int_t * );
-char *config_GetConfigFile ( libvlc_int_t * );
-char *config_GetCustomConfigFile( libvlc_int_t * );
+int __config_LoadCmdLine   ( vlc_object_t *, int *, const char *[], bool );
 int __config_LoadConfigFile( vlc_object_t *, const char * );
 
+const char *config_GetDataDirDefault( void );
+
 int IsConfigStringType( int type );
 int IsConfigIntegerType (int type);
 static inline int IsConfigFloatType (int type)
@@ -58,18 +54,10 @@ static inline int IsConfigFloatType (int type)
     return type == CONFIG_ITEM_FLOAT;
 }
 
-int ConfigStringToKey( const char * );
+uint_fast32_t ConfigStringToKey( const char * );
+char *ConfigKeyToString( uint_fast32_t );
 
-/* The configuration file and directory */
-#if defined (SYS_BEOS)
-#  define CONFIG_DIR                    "config/settings/VideoLAN Client"
-#elif defined (__APPLE__)
-#  define CONFIG_DIR                    "Library/Preferences/VLC"
-#elif defined( WIN32 ) || defined( UNDER_CE )
-#  define CONFIG_DIR                    "vlc"
-#else
-#  define CONFIG_DIR                    ".vlc"
-#endif
+/* The configuration file */
 #define CONFIG_FILE                     "vlcrc"
 
 # ifdef __cplusplus