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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 13:09:50 +01:00
parent bf56f9f0bc c1140e0c1c
commit 9bd8b2b10c
27 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/widget/menue.cpp
View File

@@ -1047,21 +1047,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);
}
}