mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +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
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
This commit is contained in:
vanhofen
2017-03-01 13:09:50 +01:00
parent f5d9d25957 a9edf315db
commit 260127f781
27 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/setting_helpers.cpp
View File

@@ -75,7 +75,7 @@
#include <zapit/satconfig.h>
#include <zapit/zapit.h>
extern CPlugins * g_PluginList; /* neutrino.cpp */
extern CPlugins * g_Plugins; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
extern cVideo *videoDecoder;
extern cAudio *audioDecoder;
@@ -401,7 +401,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;