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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

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


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 13:10:36 +01:00
parent 5e5451332e c498527390
commit 0e588328e0
27 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/miscsettings_menu.cpp
View File

@@ -59,7 +59,7 @@
#include <sectionsdclient/sectionsdclient.h>
extern CPlugins * g_PluginList;
extern CPlugins * g_Plugins;
extern cVideo *videoDecoder;
CMiscMenue::CMiscMenue()
@@ -98,7 +98,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;
}
@@ -110,13 +110,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)));
}
}