mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-15 17:33:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
This commit is contained in:
vanhofen
2017-03-01 13:10:36 +01:00
parent 68e2832f96 55cf6232f7
commit a360c99a70
27 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -64,7 +64,7 @@ extern CInfoIcons *InfoIcons; /* neutrino.cpp */
//NI
#include "gui/update.h"
extern CPlugins *g_PluginList;//for relodplugins
extern CPlugins *g_Plugins;//for relodplugins
extern CBouquetManager *g_bouquetManager;
#define EVENTDEV "/dev/input/input0"
@@ -2041,7 +2041,7 @@ void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)
void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
{
g_PluginList->loadPlugins();
g_Plugins->loadPlugins();
hh->SendOk();
}

2
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -36,7 +36,7 @@
//NI y-funcs
#include "gui/plugins.h"
extern CPlugins *g_PluginList;
extern CPlugins *g_Plugins;
#include "gui/infoicons.h"
extern CInfoIcons *InfoIcons; /* neutrino.cpp */
#include "gui/netfs_setup.h"