mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

move PLUGINDIR_VAR to global.h to avoid some hardcoded paths

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e6d7ad765
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- move PLUGINDIR_VAR to global.h to avoid some hardcoded paths

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-05-06 10:34:24 +02:00
parent c2486e880b
commit c095a9cbd5
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/global.h
View File

@@ -48,6 +48,8 @@
#define LOCALEDIR_VAR "/var/tuxbox/locale" #define LOCALEDIR_VAR "/var/tuxbox/locale"
#define THEMESDIR_VAR "/var/tuxbox/themes" #define THEMESDIR_VAR "/var/tuxbox/themes"
#define PLUGINDIR_VAR "/var/tuxbox/plugins"
#define PLUGINDIR_MNT "/mnt/plugins"
NEUTRINO_CPP SNeutrinoSettings g_settings; NEUTRINO_CPP SNeutrinoSettings g_settings;
NEUTRINO_CPP SglobalInfo g_info; NEUTRINO_CPP SglobalInfo g_info;

3
src/gui/plugins.cpp
View File

@@ -74,9 +74,6 @@ extern cVideo * videoDecoder;
extern CPlugins * g_PluginList; /* neutrino.cpp */ extern CPlugins * g_PluginList; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
#define PLUGINDIR_VAR "/var/tuxbox/plugins"
#define PLUGINDIR_MNT "/mnt/plugins"
CPlugins::CPlugins() CPlugins::CPlugins()
{ {
frameBuffer = NULL; frameBuffer = NULL;

8
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -81,9 +81,11 @@ void CControlAPI::init(CyhookHandler *hh)
PLUGIN_DIRS[1].append("/scripts"); PLUGIN_DIRS[1].append("/scripts");
PLUGIN_DIRS[2]=PLUGIN_DIRS[3]=hh->WebserverConfigList["WebsiteMain.directory"]; PLUGIN_DIRS[2]=PLUGIN_DIRS[3]=hh->WebserverConfigList["WebsiteMain.directory"];
PLUGIN_DIRS[3].append("/scripts"); PLUGIN_DIRS[3].append("/scripts");
PLUGIN_DIRS[4]="/var/tuxbox/plugins"; PLUGIN_DIRS[4]=GAMESDIR;
PLUGIN_DIRS[5]=PLUGINDIR; PLUGIN_DIRS[5]=g_settings.plugin_hdd_dir;
PLUGIN_DIRS[6]="/mnt/plugins"; PLUGIN_DIRS[6]=PLUGINDIR_MNT;
PLUGIN_DIRS[7]=PLUGINDIR_VAR;
PLUGIN_DIRS[8]=PLUGINDIR;
} }
} }

2
src/nhttpd/tuxboxapi/coolstream/controlapi.h
View File

@@ -115,7 +115,7 @@ private:
protected: 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]; static std::string PLUGIN_DIRS[PLUGIN_DIR_COUNT];
CNeutrinoAPI *NeutrinoAPI; CNeutrinoAPI *NeutrinoAPI;