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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4999c74ac0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-07-29 20:55:15 +02:00
parent d53a38cd72 b1998476ba
commit 7cfc6ad001
9 changed files with 435 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/infoviewer.cpp
View File

@@ -1077,6 +1077,13 @@ void CInfoViewer::loop(bool show_dot)
g_RCInput->postMsg (msg, 0);
res = messages_return::cancel_info;
} else if (msg == CRCInput::RC_info) { //NI
if (fileplay)
{
CMoviePlayerGui::getInstance().setFromInfoviewer(true);
g_RCInput->postMsg (msg, data);
hideIt = true;
}
else
g_RCInput->postMsg (NeutrinoMessages::SHOW_EPG, 0);
res = messages_return::cancel_info;
} else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {