Add --data-path option. Access the src share directory now works from build tree.

[vlc] / src / config / configuration.h

diff --git a/src/config/configuration.h b/src/config/configuration.h
index e078443a1eb7cf0df4d6b5a2bd274497639c5ca3..2e88f9981cc62b44acd898011216e0fdce1e614d 100644 (file)
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -45,6 +45,8 @@ void config_UnsetCallbacks( module_config_t *, size_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)
@@ -52,23 +54,12 @@ 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"
-#  define CACHES_DIR                    "Library/Caches/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
 }
 # endif