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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-12-28 12:32:12 +01:00
parent c8d0f6faaf 85fc0dd24c
commit 770e405c50
112 changed files with 2783 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/plugins.cpp
View File

@@ -192,13 +192,15 @@ bool CPlugins::parseCfg(plugin *plugin_data)
{};
plugin_data->index = sindex++;
plugin_data->key = 0; //CRCInput::RC_nokey
plugin_data->key = CRCInput::RC_nokey;
#if 0
plugin_data->fb = false;
plugin_data->rc = false;
plugin_data->lcd = false;
plugin_data->vtxtpid = false;
plugin_data->showpig = false;
plugin_data->needoffset = false;
#endif
plugin_data->shellwindow = false;
plugin_data->hide = false;
plugin_data->type = CPlugins::P_TYPE_DISABLED;
@@ -222,9 +224,9 @@ bool CPlugins::parseCfg(plugin *plugin_data)
{
plugin_data->index = atoi(parm);
}
else if (cmd == "pluginversion")
else if (cmd == "key")
{
plugin_data->key = atoi(parm);
plugin_data->key = getPluginKey(parm);
}
else if (cmd == "name")
{
@@ -250,6 +252,7 @@ bool CPlugins::parseCfg(plugin *plugin_data)
{
plugin_data->integration = getPluginIntegration(atoi(parm));
}
#if 0
else if (cmd == "needfb")
{
plugin_data->fb = atoi(parm);
@@ -274,6 +277,7 @@ bool CPlugins::parseCfg(plugin *plugin_data)
{
plugin_data->needoffset = atoi(parm);
}
#endif
else if (cmd == "shellwindow")
{
plugin_data->shellwindow = atoi(parm);
@@ -559,3 +563,17 @@ CPlugins::i_type_t CPlugins::getPluginIntegration(int integration)
return I_TYPE_DISABLED;
}
}
neutrino_msg_t CPlugins::getPluginKey(std::string key)
{
if (key == "red")
return CRCInput::RC_red;
else if (key == "green")
return CRCInput::RC_green;
else if (key == "yellow")
return CRCInput::RC_yellow;
else if (key == "blue")
return CRCInput::RC_blue;
else /* (key == "auto") */
return CRCInput::RC_nokey;
}