[vlc-commits] commit: Win32: fix the path to the plugins cache (Geoffroy Couprie )

[git at videolan.org]

vlc | branch: master | Geoffroy Couprie <geal at videolan.org> | Sun Mar  7 20:32:54 2010 +0100| [0bcf39540635289e6fcacf1cb6da6b0ac0f03279] | committer: Geoffroy Couprie 

Win32: fix the path to the plugins cache

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0bcf39540635289e6fcacf1cb6da6b0ac0f03279
---

 extras/package/win32/vlc.win32.nsi.in |   16 ++--------------
 src/modules/modules.c                 |   25 +------------------------
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index aba00fa..0c91243 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -326,21 +326,9 @@ FunctionEnd
 !macroend
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; 3. Delete prefs and cache ;
+; 3. Delete prefs           ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-Function ExecCacheGen
-  ExecWait "$INSTDIR\vlc-cache-gen.exe $APPDATA\VideoLAN\VLC"
-FunctionEnd
-
-!macro gencache
-  SetShellVarContext all
-  CreateDirectory "$APPDATA\VideoLAN"
-  CreateDirectory "$APPDATA\VideoLAN\VLC"
-  !insertmacro UAC.CallFunctionAsUser ExecCacheGen
-  SetShellVarContext current
-!macroend
-
 !macro delprefs
   StrCpy $0 0
   !define Index 'Line${__LINE__}'
@@ -459,7 +447,7 @@ Section $Name_Section01 SEC01
 @BUILD_SKINS_TRUE@   !insertmacro InstallFolder skins
 @BUILD_HTTPD_TRUE@   !insertmacro InstallFolder http
 @BUILD_LUA_TRUE@     !insertmacro InstallFolder lua
-  !insertmacro gencache
+  ExecWait "$INSTDIR\vlc-cache-gen.exe $INSTDIR\plugins"
 
 
   ; URLs
diff --git a/src/modules/modules.c b/src/modules/modules.c
index b8016f1..6c6465a 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -821,19 +821,9 @@ static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank )
     /* Contruct the special search path for system that have a relocatable
      * executable. Set it to <vlc path>/plugins. */
     assert( vlcpath );
-#ifndef WIN32
+
     if( asprintf( &path, "%s" DIR_SEP "plugins", vlcpath ) != -1 )
         vlc_array_append( arraypaths, path );
-#else
-    /* Store the plugins cache in the common AppData folder */
-    char commonpath[PATH_MAX] = "";
-    int res = snprintf( commonpath, PATH_MAX -1, "%s\\VideoLAN\\VLC", config_GetConfDir());
-        if(res == -1 || res >= PATH_MAX)
-        {
-            vlc_array_destroy( arraypaths );
-            return;
-        }
-#endif
 
     /* If the user provided a plugin path, we add it to the list */
     char *userpaths = var_InheritString( p_this, "plugin-path" );
@@ -855,17 +845,9 @@ static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank )
 
         size_t offset = p_module_bank->i_cache;
         if( b_reset )
-#ifndef WIN32
             CacheDelete( p_this, path );
-#else
-            CacheDelete( p_this, commonpath );
-#endif
         else
-#ifndef WIN32
             CacheLoad( p_this, p_module_bank, path );
-#else
-             CacheLoad( p_this, p_module_bank, commonpath );
-#endif
 
         msg_Dbg( p_this, "recursively browsing `%s'", path );
 
@@ -873,13 +855,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank )
         AllocatePluginDir( p_this, p_bank, path, 5 );
 
 
-#ifndef WIN32
         CacheSave( p_this, path, p_module_bank->pp_cache + offset,
                    p_module_bank->i_cache - offset );
-#else
-        CacheSave( p_this, commonpath, p_module_bank->pp_cache + offset,
-                   p_module_bank->i_cache - offset );
-#endif
         free( path );
     }