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

[vlc] / src / config / dirs_win.c

diff --git a/src/config/dirs_win.c b/src/config/dirs_win.c
index fb9edbea1acd792aab39b4e778ef004865c42896..ea7410ebaee264ea8eef64306242bf5b50cb2f18 100644 (file)
--- a/src/config/dirs_win.c
+++ b/src/config/dirs_win.c
@@ -43,7 +43,7 @@
 #include <assert.h>
 #include <limits.h>
 
-const char *config_GetDataDir( void )
+const char *config_GetDataDirDefault( void )
 {
     static char path[PATH_MAX] = "";
 #warning FIXME: thread-safety!
@@ -109,11 +109,7 @@ static char *config_GetAppDir (void)
     return psz_dir;
 }
 
-char *config_GetCacheDir( void )
-{
-    return config_GetAppDir ();
-}
-
+#warning FIXME Use known folders on Vista and above
 char *config_GetUserDir (vlc_userdir_t type)
 {
     switch (type)
@@ -121,22 +117,22 @@ 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:
         case VLC_PUBLICSHARE_DIR:
         case VLC_DOCUMENTS_DIR:
+            return config_GetUserDir(VLC_HOME_DIR);
         case VLC_MUSIC_DIR:
-#warning FIXME: unimplemented
-            return config_GetUserDir (VLC_HOME_DIR);
+            return config_GetShellDir (CSIDL_MYMUSIC);
         case VLC_PICTURES_DIR:
             return config_GetShellDir (CSIDL_MYPICTURES);
         case VLC_VIDEOS_DIR:
-#warning FIXME: unimplemented
-            return config_GetUserDir (VLC_HOME_DIR);
+            return config_GetShellDir (CSIDL_MYVIDEO);
     }
     assert (0);
 }