From 6e6d7ad7655d274ccb23d151e3be31f2b35c013c Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Wed, 6 May 2015 10:34:24 +0200
Subject: [PATCH] - move PLUGINDIR_VAR to global.h to avoid some hardcoded
 paths

---
 src/global.h                                   | 2 ++
 src/gui/plugins.cpp                            | 3 ---
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 8 +++++---
 src/nhttpd/tuxboxapi/coolstream/controlapi.h   | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/global.h b/src/global.h
index 59de7db4e..8597d667a 100644
--- a/src/global.h
+++ b/src/global.h
@@ -48,6 +48,8 @@
 
 #define LOCALEDIR_VAR	"/var/tuxbox/locale"
 #define THEMESDIR_VAR	"/var/tuxbox/themes"
+#define PLUGINDIR_VAR	"/var/tuxbox/plugins"
+#define PLUGINDIR_MNT	"/mnt/plugins"
 
 NEUTRINO_CPP  SNeutrinoSettings	g_settings;
 NEUTRINO_CPP  SglobalInfo	g_info;
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 858e43a79..55c4714f6 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -74,9 +74,6 @@ extern cVideo * videoDecoder;
 extern CPlugins       * g_PluginList;    /* neutrino.cpp */
 extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
 
-#define PLUGINDIR_VAR "/var/tuxbox/plugins"
-#define PLUGINDIR_MNT "/mnt/plugins"
-
 CPlugins::CPlugins()
 {
 	frameBuffer = NULL;
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index f4212549b..cfd6839fc 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -81,9 +81,11 @@ void CControlAPI::init(CyhookHandler *hh)
 		PLUGIN_DIRS[1].append("/scripts");
 		PLUGIN_DIRS[2]=PLUGIN_DIRS[3]=hh->WebserverConfigList["WebsiteMain.directory"];
 		PLUGIN_DIRS[3].append("/scripts");
-		PLUGIN_DIRS[4]="/var/tuxbox/plugins";
-		PLUGIN_DIRS[5]=PLUGINDIR;
-		PLUGIN_DIRS[6]="/mnt/plugins";
+		PLUGIN_DIRS[4]=GAMESDIR;
+		PLUGIN_DIRS[5]=g_settings.plugin_hdd_dir;
+		PLUGIN_DIRS[6]=PLUGINDIR_MNT;
+		PLUGIN_DIRS[7]=PLUGINDIR_VAR;
+		PLUGIN_DIRS[8]=PLUGINDIR;
 	}
 }
 
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.h b/src/nhttpd/tuxboxapi/coolstream/controlapi.h
index a946f3c1c..de9947799 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.h
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.h
@@ -115,7 +115,7 @@ private:
 
 
 protected:
-	static const unsigned int PLUGIN_DIR_COUNT = 7;
+	static const unsigned int PLUGIN_DIR_COUNT = 9;
 	static std::string PLUGIN_DIRS[PLUGIN_DIR_COUNT];
 	CNeutrinoAPI	*NeutrinoAPI;