mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- rename g_PluginList to g_Plugins; this isn't a list of plugins

Browse Source
This commit is contained in:
svenhoefer
2017-03-01 13:03:50 +01:00
parent 5edc857122
commit 856c676430
14 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/neutrino.cpp
View File

@@ -201,7 +201,7 @@ CBouquetList * RADIOwebList;
CBouquetList * AllFavBouquetList;
CPlugins * g_PluginList;
CPlugins * g_Plugins;
CRemoteControl * g_RemoteControl;
CPictureViewer * g_PicViewer;
CCAMMenuHandler * g_CamHandler;
@@ -2186,10 +2186,10 @@ TIMER_START();
#endif
CFSMounter::automount();
g_PluginList = new CPlugins;
g_PluginList->setPluginDir(PLUGINDIR);
g_Plugins = new CPlugins;
g_Plugins->setPluginDir(PLUGINDIR);
//load Pluginlist before main menu (only show script menu if at least one script is available
g_PluginList->loadPlugins();
g_Plugins->loadPlugins();
// setup recording device
setupRecordingDevice();
@@ -2365,9 +2365,9 @@ void CNeutrinoApp::RealRun()
#ifdef ENABLE_LUA
CLuaServer *luaServer = CLuaServer::getInstance();
#endif
g_PluginList->startPlugin("startup");
if (!g_PluginList->getScriptOutput().empty()) {
ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL);
g_Plugins->startPlugin("startup");
if (!g_Plugins->getScriptOutput().empty()) {
ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL);
}
g_RCInput->clearRCMsg();
@@ -3485,9 +3485,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
}
else if (msg == NeutrinoMessages::EVT_START_PLUGIN) {
g_PluginList->startPlugin((const char *)data);
if (!g_PluginList->getScriptOutput().empty()) {
ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack,CMsgBox::mbBack,NEUTRINO_ICON_SHELL);
g_Plugins->startPlugin((const char *)data);
if (!g_Plugins->getScriptOutput().empty()) {
ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack,CMsgBox::mbBack,NEUTRINO_ICON_SHELL);
}
delete[] (unsigned char*) data;
@@ -4079,7 +4079,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_GETPLUGINS_HINT));
hintBox.paint();
g_PluginList->loadPlugins();
g_Plugins->loadPlugins();
hintBox.hide();
}
@@ -4650,7 +4650,7 @@ void CNeutrinoApp::Cleanup()
printf("cleanup 12\n");fflush(stdout);
delete g_PicViewer; g_PicViewer = NULL;
printf("cleanup 13\n");fflush(stdout);
delete g_PluginList; g_PluginList = NULL;
delete g_Plugins; g_Plugins = NULL;
printf("cleanup 16\n");fflush(stdout);
delete g_CamHandler; g_CamHandler = NULL;
printf("cleanup 17\n");fflush(stdout);