mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +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

4
src/gui/plugins.cpp
View File

@@ -71,7 +71,7 @@ extern cVideo * videoDecoder;
#include <daemonc/remotecontrol.h>
#include <gui/lua/luainstance.h>
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;