From c1140e0c1cce9fba18f5149f8ef44b19d7b791a8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 1 Mar 2017 13:03:50 +0100 Subject: [PATCH] rename g_PluginList to g_Plugins; this isn't a list of plugins Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/856c6764306bfa446cf62f242609a9f1177d4df8 Author: vanhofen Date: 2017-03-01 (Wed, 01 Mar 2017) Origin message was: ------------------ - rename g_PluginList to g_Plugins; this isn't a list of plugins ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/miscsettings_menu.cpp | 10 +++--- src/gui/movieplayer.cpp | 2 +- src/gui/osdlang_setup.cpp | 2 +- src/gui/personalize.cpp | 34 +++++++++---------- src/gui/personalize.h | 2 +- src/gui/pluginlist.cpp | 28 ++++++++-------- src/gui/plugins.cpp | 4 +-- src/gui/user_menue.cpp | 52 ++++++++++++++--------------- src/gui/user_menue_setup.cpp | 6 ++-- src/gui/widget/menue.cpp | 10 +++--- src/neutrino.cpp | 24 ++++++------- src/neutrino_menue.cpp | 10 +++--- src/nhttpd/tuxboxapi/controlapi.cpp | 4 +-- src/system/setting_helpers.cpp | 4 +-- 14 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 176629ac6..af84c0213 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -60,7 +60,7 @@ #include -extern CPlugins * g_PluginList; +extern CPlugins * g_Plugins; extern cVideo *videoDecoder; CMiscMenue::CMiscMenue() @@ -99,7 +99,7 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey) { const char *action_str = "plugin"; if(chooserDir(g_settings.plugin_hdd_dir, false, action_str)) - g_PluginList->loadPlugins(); + g_Plugins->loadPlugins(); return menu_return::RETURN_REPAINT; } @@ -111,13 +111,13 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey) MoviePluginSelector.addItem(GenericMenuSeparatorLine); char id[5]; int enabled_count = 0; - for(unsigned int count=0;count < (unsigned int) g_PluginList->getNumberOfPlugins();count++) + for(unsigned int count=0;count < (unsigned int) g_Plugins->getNumberOfPlugins();count++) { - if (!g_PluginList->isHidden(count)) + if (!g_Plugins->isHidden(count)) { sprintf(id, "%d", count); enabled_count++; - MoviePluginSelector.addItem(new CMenuForwarder(g_PluginList->getName(count), true, NULL, new CMoviePluginChangeExec(), id, CRCInput::convertDigitToKey(count))); + MoviePluginSelector.addItem(new CMenuForwarder(g_Plugins->getName(count), true, NULL, new CMoviePluginChangeExec(), id, CRCInput::convertDigitToKey(count))); } } diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 05fd0b093..fead5c9be 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1384,7 +1384,7 @@ void CMoviePlayerGui::PlayFileLoop(void) } if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) { - g_PluginList->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ()); + g_Plugins->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ()); } else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) { playstate = CMoviePlayerGui::STOPPED; keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP; diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index dbf05ff02..4ac06cf4c 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -76,7 +76,7 @@ int COsdLangSetup::exec(CMenuTarget* parent, const std::string &actionKey) if (!actionKey.empty()) { g_settings.language = actionKey; - g_PluginList->loadPlugins(); + g_Plugins->loadPlugins(); g_Locale->loadLocale(g_settings.language.c_str()); return menu_return::RETURN_EXIT; } diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index 7461c0b76..0cf748993 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -390,7 +390,7 @@ int CPersonalizeGui::ShowPersonalizationMenu() ShowUserMenu(); } CMenuWidget* plMenu = NULL; - int pcount = g_PluginList->getNumberOfPlugins(); + int pcount = g_Plugins->getNumberOfPlugins(); std::string pldesc[pcount]; int pltype[pcount]; if (show_pluginmenu) @@ -418,31 +418,31 @@ int CPersonalizeGui::ShowPersonalizationMenu() if (pltype[i] & CPlugins::P_TYPE_DISABLED) { if (!g_settings.plugins_disabled.empty()) g_settings.plugins_disabled += ","; - g_settings.plugins_disabled += g_PluginList->getFileName(i); - g_PluginList->setType(i, CPlugins::P_TYPE_DISABLED); + g_settings.plugins_disabled += g_Plugins->getFileName(i); + g_Plugins->setType(i, CPlugins::P_TYPE_DISABLED); } else if (pltype[i] & CPlugins::P_TYPE_GAME) { if (!g_settings.plugins_game.empty()) g_settings.plugins_game += ","; - g_settings.plugins_game += g_PluginList->getFileName(i); - g_PluginList->setType(i, CPlugins::P_TYPE_GAME); + g_settings.plugins_game += g_Plugins->getFileName(i); + g_Plugins->setType(i, CPlugins::P_TYPE_GAME); } else if (pltype[i] & CPlugins::P_TYPE_TOOL) { if (!g_settings.plugins_tool.empty()) g_settings.plugins_tool += ","; - g_settings.plugins_tool += g_PluginList->getFileName(i); - g_PluginList->setType(i, CPlugins::P_TYPE_TOOL); + g_settings.plugins_tool += g_Plugins->getFileName(i); + g_Plugins->setType(i, CPlugins::P_TYPE_TOOL); } else if (pltype[i] & CPlugins::P_TYPE_SCRIPT) { if (!g_settings.plugins_script.empty()) g_settings.plugins_script += ","; - g_settings.plugins_script += g_PluginList->getFileName(i); - g_PluginList->setType(i, CPlugins::P_TYPE_SCRIPT); + g_settings.plugins_script += g_Plugins->getFileName(i); + g_Plugins->setType(i, CPlugins::P_TYPE_SCRIPT); } else if (pltype[i] & CPlugins::P_TYPE_LUA) { if (!g_settings.plugins_lua.empty()) g_settings.plugins_lua += ","; - g_settings.plugins_lua += g_PluginList->getFileName(i); - g_PluginList->setType(i, CPlugins::P_TYPE_LUA); + g_settings.plugins_lua += g_Plugins->getFileName(i); + g_Plugins->setType(i, CPlugins::P_TYPE_LUA); } } - g_PluginList->loadPlugins(); + g_Plugins->loadPlugins(); } if (show_usermenu) @@ -571,18 +571,18 @@ void CPersonalizeGui::ShowPluginMenu(CMenuWidget* p_widget, std::string da[], in p_widget->addIntroItems(LOCALE_PERSONALIZE_PLUGINS); uint d_key = 1; - int pcount = g_PluginList->getNumberOfPlugins(); + int pcount = g_Plugins->getNumberOfPlugins(); for (int i = 0; i < pcount; i++) { - ia[i] = g_PluginList->getType(i); - da[i] = g_PluginList->getName(i); + ia[i] = g_Plugins->getType(i); + da[i] = g_Plugins->getName(i); if (da[i].empty()) continue; - std::string pluginDesc = g_PluginList->getDescription(i); + std::string pluginDesc = g_Plugins->getDescription(i); if (!pluginDesc.empty()) da[i] += " (" + pluginDesc + ")"; p_widget->addItem(new CMenuOptionChooser(da[i].c_str(), &ia[i], PERSONALIZE_PLUGINTYPE_OPTIONS, PERSONALIZE_PLUGINTYPE_MAX, - !g_PluginList->isHidden(i), NULL, getShortcut(d_key++))); + !g_Plugins->isHidden(i), NULL, getShortcut(d_key++))); } } diff --git a/src/gui/personalize.h b/src/gui/personalize.h index 2a92f6f2b..7b63cda0a 100644 --- a/src/gui/personalize.h +++ b/src/gui/personalize.h @@ -61,7 +61,7 @@ #include class CPlugins; -extern CPlugins * g_PluginList; /* neutrino.cpp */ +extern CPlugins * g_Plugins; /* neutrino.cpp */ //helper class to enable/disable some items in usermenu setup class CUserMenuNotifier : public CChangeObserver diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp index f44432096..33e743300 100644 --- a/src/gui/pluginlist.cpp +++ b/src/gui/pluginlist.cpp @@ -61,7 +61,7 @@ #include "plugins.h" -extern CPlugins * g_PluginList; /* neutrino.cpp */ +extern CPlugins * g_Plugins; /* neutrino.cpp */ CPluginList::CPluginList(const neutrino_locale_t Title, const uint32_t listtype) { @@ -74,10 +74,10 @@ CPluginList::CPluginList(const neutrino_locale_t Title, const uint32_t listtype) int CPluginList::run() { - g_PluginList->startPlugin(number); - if (!g_PluginList->getScriptOutput().empty()) { + g_Plugins->startPlugin(number); + if (!g_Plugins->getScriptOutput().empty()) { hide(); - ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL, 320, g_settings.timing[SNeutrinoSettings::TIMING_STATIC_MESSAGES]); + ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL, 320, g_settings.timing[SNeutrinoSettings::TIMING_STATIC_MESSAGES]); } return menu_return::RETURN_REPAINT; } @@ -108,14 +108,14 @@ int CPluginList::exec(CMenuTarget* parent, const std::string &actionKey) m.setSelected(selected); m.addIntroItems(); - int nop = g_PluginList->getNumberOfPlugins(); + int nop = g_Plugins->getNumberOfPlugins(); for(int count = 0; count < nop; count++) { - if ((g_PluginList->getType(count) & pluginlisttype) && !g_PluginList->isHidden(count) && (g_PluginList->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) { - neutrino_msg_t d_key = g_PluginList->getKey(count); + if ((g_Plugins->getType(count) & pluginlisttype) && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) { + neutrino_msg_t d_key = g_Plugins->getKey(count); keyhelper.get(&key, &dummy, d_key); - CMenuForwarder *f = new CMenuForwarder(std::string(g_PluginList->getName(count)), true, NULL, this, to_string(count).c_str(), key); - f->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count)); + CMenuForwarder *f = new CMenuForwarder(std::string(g_Plugins->getName(count)), true, NULL, this, to_string(count).c_str(), key); + f->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count)); m.addItem(f); } } @@ -134,7 +134,7 @@ CPluginChooser::CPluginChooser(const neutrino_locale_t Name, const uint32_t list int CPluginChooser::run() { if (number > -1) - *selectedFilePtr = g_PluginList->getFileName(number); + *selectedFilePtr = g_Plugins->getFileName(number); return menu_return::RETURN_EXIT; } @@ -165,12 +165,12 @@ int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey) return menu_return::RETURN_EXIT; } else if (sel >= 0) - g_PluginList->startPlugin(sel); + g_Plugins->startPlugin(sel); - if (!g_PluginList->getScriptOutput().empty()) - ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL); + if (!g_Plugins->getScriptOutput().empty()) + ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL); - if (g_PluginList->getIntegration(sel) == CPlugins::I_TYPE_DISABLED) + if (g_Plugins->getIntegration(sel) == CPlugins::I_TYPE_DISABLED) return menu_return::RETURN_EXIT; return menu_return::RETURN_REPAINT; diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp index 9f0b5f29e..0f7bdc7e6 100644 --- a/src/gui/plugins.cpp +++ b/src/gui/plugins.cpp @@ -71,7 +71,7 @@ extern cVideo * videoDecoder; #include #include -extern CPlugins * g_PluginList; /* neutrino.cpp */ +extern CPlugins * g_Plugins; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ CPlugins::CPlugins() @@ -354,7 +354,7 @@ void CPlugins::startPlugin_by_name(const std::string & name) { for (int i = 0; i < (int) plugin_list.size(); i++) { - if (name.compare(g_PluginList->getName(i)) == 0) + if (name.compare(g_Plugins->getName(i)) == 0) { startPlugin(i); return; diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index bd5987f30..a7d77530d 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -84,7 +84,7 @@ #include extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ -extern CPlugins * g_PluginList; /* neutrino.cpp */ +extern CPlugins * g_Plugins; /* neutrino.cpp */ extern cVideo * videoDecoder; #if !HAVE_SPARK_HARDWARE extern CCAMMenuHandler * g_CamHandler; @@ -326,33 +326,33 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) } case SNeutrinoSettings::ITEM_PLUGIN_TYPES: { - unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins(); + unsigned int number_of_plugins = (unsigned int) g_Plugins->getNumberOfPlugins(); if (!number_of_plugins) continue; for (unsigned int count = 0; count < number_of_plugins; count++) { #if 0 - bool show = g_PluginList->getType(count) == CPlugins::P_TYPE_TOOL || - g_PluginList->getType(count) == CPlugins::P_TYPE_LUA; + bool show = g_Plugins->getType(count) == CPlugins::P_TYPE_TOOL || + g_Plugins->getType(count) == CPlugins::P_TYPE_LUA; #endif bool show = false; if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_GAMES]) - show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_GAME; + show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_GAME; if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_TOOLS]) - show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_TOOL; + show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_TOOL; if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_SCRIPTS]) - show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_SCRIPT; + show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_SCRIPT; if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_LUA]) - show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_LUA; + show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_LUA; - if (show && !g_PluginList->isHidden(count) && (g_PluginList->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) + if (show && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) { menu_items++; - neutrino_msg_t d_key = g_PluginList->getKey(count); - //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count)); + neutrino_msg_t d_key = g_Plugins->getKey(count); + //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_Plugins->getKey(count)); keyhelper.get(&key,&icon, d_key); - menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon); - menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count)); + menu_item = new CMenuForwarder(g_Plugins->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon); + menu_item->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count)); menu->addItem(menu_item, false); } @@ -393,14 +393,14 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) case SNeutrinoSettings::ITEM_GAMES: { keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon ); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon ); menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); break; } case SNeutrinoSettings::ITEM_SCRIPTS: { keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon ); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon ); menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); break; } @@ -421,14 +421,14 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) case SNeutrinoSettings::ITEM_TOOLS: { keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon ); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon ); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } case SNeutrinoSettings::ITEM_LUA: { keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon ); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon ); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } @@ -485,17 +485,17 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) } case -1: // plugin { - int number_of_plugins = g_PluginList->getNumberOfPlugins(); + int number_of_plugins = g_Plugins->getNumberOfPlugins(); if (!number_of_plugins) continue; int count = 0; for(; count < number_of_plugins; count++) { - const char *pname = g_PluginList->getFileName(count); - if (pname && (std::string(pname) == *it) && !g_PluginList->isHidden(count)) { - neutrino_msg_t d_key = g_PluginList->getKey(count); + const char *pname = g_Plugins->getFileName(count); + if (pname && (std::string(pname) == *it) && !g_Plugins->isHidden(count)) { + neutrino_msg_t d_key = g_Plugins->getKey(count); keyhelper.get(&key,&icon, d_key); - menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon); - menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count)); + menu_item = new CMenuForwarder(g_Plugins->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon); + menu_item->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count)); break; } } @@ -553,10 +553,10 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu if(loc != NONEXISTANT_LOCALE || text) return_title = true; else { - int nop = g_PluginList->getNumberOfPlugins(); + int nop = g_Plugins->getNumberOfPlugins(); for(int count = 0; count < nop; count++) { - if (std::string(g_PluginList->getFileName(count)) == *it) { - text = g_PluginList->getName(count); + if (std::string(g_Plugins->getFileName(count)) == *it) { + text = g_Plugins->getName(count); active = true; break; } diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index b67a76370..900ad3c75 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -120,10 +120,10 @@ CUserMenuSetup::CUserMenuSetup(neutrino_locale_t menue_title, int menue_button) vals[keys[loc]] = loc; } - int number_of_plugins = g_PluginList->getNumberOfPlugins(); + int number_of_plugins = g_Plugins->getNumberOfPlugins(); for (int count = 0; count < number_of_plugins; count++) { - const char *loc = g_PluginList->getName(count); - const char *key = g_PluginList->getFileName(count); + const char *loc = g_Plugins->getName(count); + const char *key = g_Plugins->getFileName(count); if (loc && *loc && key && *key) { options.push_back(loc); keys[loc] = key; diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index d859c966b..3ccd2905c 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1029,21 +1029,21 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) void CMenuWidget::integratePlugins(CPlugins::i_type_t integration, const unsigned int shortcut, bool enabled) { bool separatorline = false; - unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins(); + unsigned int number_of_plugins = (unsigned int) g_Plugins->getNumberOfPlugins(); unsigned int sc = shortcut; for (unsigned int count = 0; count < number_of_plugins; count++) { - if ((g_PluginList->getIntegration(count) == integration) && !g_PluginList->isHidden(count)) + if ((g_Plugins->getIntegration(count) == integration) && !g_Plugins->isHidden(count)) { if (!separatorline) { addItem(GenericMenuSeparatorLine); separatorline = true; } - printf("[neutrino] integratePlugins: add %s\n", g_PluginList->getName(count)); + printf("[neutrino] integratePlugins: add %s\n", g_Plugins->getName(count)); neutrino_msg_t dk = (shortcut != CRCInput::RC_nokey) ? CRCInput::convertDigitToKey(sc++) : CRCInput::RC_nokey; - CMenuForwarder *fw_plugin = new CMenuForwarder(g_PluginList->getName(count), enabled, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), dk); - fw_plugin->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count)); + CMenuForwarder *fw_plugin = new CMenuForwarder(g_Plugins->getName(count), enabled, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), dk); + fw_plugin->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count)); addItem(fw_plugin); } } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index e02de17e5..08b728cdd 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -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); diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 158074334..7665c847f 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -82,7 +82,7 @@ #include "driver/display.h" -extern CPlugins * g_PluginList; +extern CPlugins * g_Plugins; extern CRemoteControl * g_RemoteControl; extern CCAMMenuHandler * g_CamHandler; // extern bool has_hdd; @@ -195,25 +195,25 @@ void CNeutrinoApp::InitMenuMain() CMenuForwarder * mf; if (!g_settings.easymenu) { //games - bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME); + bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME); mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME)); mf->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]); //tools - bool show_tools = g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL); + bool show_tools = g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL); mf = new CMenuForwarder(LOCALE_MAINMENU_TOOLS, show_tools, NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL)); mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_TOOLS); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TOOLS]); //scripts - bool show_scripts = g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT); + bool show_scripts = g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT); mf = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, show_scripts, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT)); mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]); //lua - bool show_lua = g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA); + bool show_lua = g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA); mf = new CMenuForwarder(LOCALE_MAINMENU_LUA, show_lua, NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA)); mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_LUA); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_LUA]); diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 49f9bee1f..6f64faf4c 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -56,7 +56,7 @@ extern CPictureViewer *g_PicViewer; extern cVideo * videoDecoder; -extern CPlugins *g_PluginList;//for relodplugins +extern CPlugins *g_Plugins;//for relodplugins extern CBouquetManager *g_bouquetManager; #define EVENTDEV "/dev/input/input0" @@ -2024,7 +2024,7 @@ void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh) void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh) { - g_PluginList->loadPlugins(); + g_Plugins->loadPlugins(); hh->SendOk(); } diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index d14bae874..f53bce83e 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -75,7 +75,7 @@ #include #include -extern CPlugins * g_PluginList; /* neutrino.cpp */ +extern CPlugins * g_Plugins; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern cVideo *videoDecoder; extern cAudio *audioDecoder; @@ -391,7 +391,7 @@ int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & action { int sel = atoi(actionKey.c_str()); if (sel >= 0) - g_settings.movieplayer_plugin = g_PluginList->getName(sel); + g_settings.movieplayer_plugin = g_Plugins->getName(sel); } return menu_return::RETURN_EXIT;