[squash] Vortex: fixed add-on directories to not hard-coded to specia…

…l://xbmc/addons/
xbmc · May 27, 2015 · 927cb04 · 927cb04
1 parent c29a075
commit 927cb04
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.cpp
@@ -94,10 +94,11 @@ class TrackInfo
 	char       Rating;
 };
 
-char g_TexturePath[ 512 ] = "special://xbmc/addons/visualization.vortex/resources/Textures/";
-char g_PresetPath[ 512 ] = "special://xbmc/addons/visualization.vortex/resources/Presets/";
-char g_TransitionPath[ 512 ] = "special://xbmc//addons/visualization.vortex/resources/Transitions/";
-char g_AnnouncePath[ 512 ] = "special://xbmc/addons/visualization.vortex/resources/Announcements/";
+char g_pluginPath[ MAX_PATH ];
+char g_TexturePath[ MAX_PATH ];
+char g_PresetPath[ MAX_PATH ];
+char g_TransitionPath[ MAX_PATH ];
+char g_AnnouncePath[ MAX_PATH ];
 
 class FileHolder
 {
@@ -306,9 +307,25 @@ int GetRandomPreset()
 	return nextPreset;
 }
 
+void Vortex::InitPaths(void)
+{
+  strcpy(g_TexturePath, g_pluginPath);
+  strcat(g_TexturePath, "/resources/Textures/");
+
+  strcpy(g_PresetPath, g_pluginPath);
+  strcat(g_PresetPath, "/resources/Presets/");
+
+  strcpy(g_TransitionPath, g_pluginPath);
+  strcat(g_TransitionPath, "/resources/Transitions/");
+
+  strcpy(g_AnnouncePath, g_pluginPath);
+  strcat(g_AnnouncePath, "/resources/Announcements/");
+}
+
 void Vortex::Init( ID3D11DeviceContext* pD3DContext, int iPosX, int iPosY, int iWidth, int iHeight, float fPixelRatio)
 {
 	InitTime();
+  InitPaths();
 
 	DebugConsole::Init();
 	Renderer::Init( pD3DContext, iPosX, iPosY, iWidth, iHeight, fPixelRatio );

diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.h b/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.h
@@ -74,6 +74,7 @@ class Vortex
 	void SaveSettings();
 
 private:
+	void InitPaths(void);
 	bool InitAngelScript();
 	asIScriptEngine* m_pScriptEngine;
 };

diff --git a/xbmc/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp b/xbmc/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp
@@ -27,6 +27,7 @@
 
 
 Vortex* g_Vortex = NULL;
+extern char g_pluginPath[];
 
 // settings vector
 //StructSetting** g_structSettings;
@@ -39,7 +40,8 @@ extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props)
 	VIS_PROPS* visprops = (VIS_PROPS*)props;
 
 	g_Vortex = new Vortex;
-  g_Vortex->Init((ID3D11DeviceContext*)visprops->device, visprops->x, visprops->y, visprops->width, visprops->height, visprops->pixelRatio);
+	strcpy(g_pluginPath, visprops->presets);
+	g_Vortex->Init(reinterpret_cast<ID3D11DeviceContext*>(visprops->device), visprops->x, visprops->y, visprops->width, visprops->height, visprops->pixelRatio);
 
 	return ADDON_STATUS_NEED_SAVEDSETTINGS;
 }