Remove config_GetCacheDir

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 3e272938a5e4d57afed38357b2dfa1bb71945bc5..c208509efc117b657e989c819e2ff83f280334df 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -222,8 +222,9 @@ typedef enum vlc_userdir
     VLC_HOME_DIR, /* User's home */
     VLC_CONFIG_DIR, /* VLC-specific configuration directory */
     VLC_DATA_DIR, /* VLC-specific data directory */
+    VLC_CACHE_DIR, /* VLC-specific user cached data directory */
     /* Generic directories (same as XDG) */
-    VLC_DESKTOP_DIR,
+    VLC_DESKTOP_DIR=0x80,
     VLC_DOWNLOAD_DIR,
     VLC_TEMPLATES_DIR,
     VLC_PUBLICSHARE_DIR,
@@ -234,7 +235,6 @@ typedef enum vlc_userdir
 } vlc_userdir_t;
 
 VLC_EXPORT(char *, config_GetUserDir, ( vlc_userdir_t ) LIBVLC_USED);
-VLC_EXPORT(char *, config_GetCacheDir, ( void ) LIBVLC_USED);
 
 VLC_EXPORT( void,       __config_AddIntf,    ( vlc_object_t *, const char * ) );
 VLC_EXPORT( void,       __config_RemoveIntf, ( vlc_object_t *, const char * ) );

diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index bfe0ab9c4dea09c572f4939f70a7d25dbce9411f..a50f7cdc42951176dfe179c23f67ce9c7f5da74c 100644 (file)
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -724,7 +724,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
     }
 #endif
     if( !psz_font_dir )
-        psz_font_dir = config_GetCacheDir();
+        psz_font_dir = config_GetUserDir( VLC_CACHE_DIR );
 
     if( !psz_font_dir )
         goto error;

diff --git a/modules/misc/lua/libs/misc.c b/modules/misc/lua/libs/misc.c
index e1b250f420a284324c6598272d108936f66c35d7..37fdb72c95ae9143c47351260b5043fae34261fa 100644 (file)
--- a/modules/misc/lua/libs/misc.c
+++ b/modules/misc/lua/libs/misc.c
@@ -144,7 +144,7 @@ static int vlclua_configdir( lua_State *L )
 
 static int vlclua_cachedir( lua_State *L )
 {
-    char *dir = config_GetCacheDir();
+    char *dir = config_GetUserDir( VLC_CACHE_DIR );
     lua_pushstring( L, dir );
     free( dir );
     return 1;

diff --git a/src/config/dirs_macos.c b/src/config/dirs_macos.c
index 4e0c8eccf6d147924aa8c4d3e5b20dedfdbd10b8..46d3b5e808c78ef28a8e65b1b037eef3b62ca785 100644 (file)
--- a/src/config/dirs_macos.c
+++ b/src/config/dirs_macos.c
@@ -133,21 +133,6 @@ static char *config_GetAppDir (void)
     return psz_dir;
 }
 
-/**
- * Get the user's VLC cache directory
- * (used for stuff like the modules cache, the album art cache, ...)
- */
-char *config_GetCacheDir( void )
-{
-    char *psz_dir;
-    const char *psz_parent = GetDir (false);
-
-    if( asprintf( &psz_dir, "%s/Library/Preferences/VLC", psz_parent ) == -1 )
-        psz_dir = NULL;
-
-    return psz_dir;
-}
-
 char *config_GetUserDir (vlc_userdir_t type)
 {
     switch (type)
@@ -155,9 +140,10 @@ char *config_GetUserDir (vlc_userdir_t type)
         case VLC_HOME_DIR:
             return config_GetHomeDir ();
         case VLC_CONFIG_DIR:
-            return config_GetAppDir ();
         case VLC_DATA_DIR:
+        case VLC_CACHE_DIR:
             return config_GetAppDir ();
+
         case VLC_DESKTOP_DIR:
         case VLC_DOWNLOAD_DIR:
         case VLC_TEMPLATES_DIR:

diff --git a/src/config/dirs_win.c b/src/config/dirs_win.c
index fb9edbea1acd792aab39b4e778ef004865c42896..d7bef3e858090d29da870b0b4548c78aa38c5afb 100644 (file)
--- a/src/config/dirs_win.c
+++ b/src/config/dirs_win.c
@@ -109,11 +109,6 @@ static char *config_GetAppDir (void)
     return psz_dir;
 }
 
-char *config_GetCacheDir( void )
-{
-    return config_GetAppDir ();
-}
-
 char *config_GetUserDir (vlc_userdir_t type)
 {
     switch (type)
@@ -121,9 +116,10 @@ char *config_GetUserDir (vlc_userdir_t type)
         case VLC_HOME_DIR:
             return config_GetShellDir (CSIDL_PERSONAL);
         case VLC_CONFIG_DIR:
-            return config_GetAppDir ();
         case VLC_DATA_DIR:
+        case VLC_CACHE_DIR:
             return config_GetAppDir ();
+
         case VLC_DESKTOP_DIR:
         case VLC_DOWNLOAD_DIR:
         case VLC_TEMPLATES_DIR:

diff --git a/src/config/dirs_xdg.c b/src/config/dirs_xdg.c
index d3a7ea214da71ce83c50c656af1dba12c0dd755f..6e934f76ae5786d9a583e6f6eb92583015a5d2fa 100644 (file)
--- a/src/config/dirs_xdg.c
+++ b/src/config/dirs_xdg.c
@@ -199,15 +199,6 @@ done:
 }
 
 
-/**
- * Get the user's VLC cache directory
- * (used for stuff like the modules cache, the album art cache, ...)
- */
-char *config_GetCacheDir( void )
-{
-    return config_GetAppDir ("CACHE", ".cache");
-}
-
 char *config_GetUserDir (vlc_userdir_t type)
 {
     switch (type)
@@ -218,6 +209,9 @@ char *config_GetUserDir (vlc_userdir_t type)
             return config_GetAppDir ("CONFIG", ".config");
         case VLC_DATA_DIR:
             return config_GetAppDir ("DATA", ".local/share");
+        case VLC_CACHE_DIR:
+            return config_GetAppDir ("CACHE", ".cache");
+
         case VLC_DESKTOP_DIR:
             return config_GetTypeDir ("DESKTOP");
         case VLC_DOWNLOAD_DIR:

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 792b10663b4724bdb9bc451a741d32898711b3d8..01cbbb4ca5ff906a01e437ddc651aa9b22d03530 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -50,7 +50,6 @@ config_ChainDuplicate
 __config_ChainParse
 __config_ExistIntf
 config_FindConfig
-config_GetCacheDir
 config_GetConfDir
 config_GetDataDir
 __config_GetFloat

diff --git a/src/modules/cache.c b/src/modules/cache.c
index 89d1a99a6d51f0a798c25fc33b2133097c058f5e..0f2f5ceceac823e8f2bea603cfca619e70bbd596 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -104,7 +104,7 @@ static int    CacheSaveConfig  ( module_t *, FILE * );
  *****************************************************************************/
 void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
 {
-    char *psz_filename, *psz_cachedir = config_GetCacheDir();
+    char *psz_filename, *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
     FILE *file;
     int i, j, i_size, i_read;
     char p_cachestring[sizeof("cache " COPYRIGHT_MESSAGE)];
@@ -475,7 +475,7 @@ void CacheSave( vlc_object_t *p_this, module_bank_t *p_bank )
         "# For information about cache directory tags, see:\r\n"
         "#   http://www.brynosaurus.com/cachedir/\r\n";
 
-    char *psz_cachedir = config_GetCacheDir();
+    char *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
     FILE *file;
     int i, j, i_cache;
     module_cache_t **pp_cache;

diff --git a/src/playlist/art.c b/src/playlist/art.c
index 5b5f36b8b9c95c191f2bc9b2bc7ca7c27f4a362f..89883a0e268a15b0a685eb00240461fb69d31e00 100644 (file)
--- a/src/playlist/art.c
+++ b/src/playlist/art.c
@@ -67,7 +67,7 @@ static char* ArtCacheGetDirPath( const char *psz_title, const char *psz_artist,
                                  const char *psz_album )
 {
     char *psz_dir;
-    char *psz_cachedir = config_GetCacheDir();
+    char *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
 
     if( !EMPTY_STR(psz_artist) && !EMPTY_STR(psz_album) )
     {