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

movieplayer/infoviewer: simplify call of showMovieInfo()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fcffe87ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- movieplayer/infoviewer: simplify call of showMovieInfo()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-23 19:48:47 +02:00
parent 435159cfe9
commit b56357a43a
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/infoviewer.cpp
View File

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

8
src/gui/movieplayer.cpp
View File

@@ -1889,13 +1889,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
showHelp(); showHelp();
enableOsdElements(NO_MUTE); enableOsdElements(NO_MUTE);
} else if (msg == CRCInput::RC_info) { } else if (msg == CRCInput::RC_info) {
if (fromInfoviewer) callInfoViewer();
{
showMovieInfo();
fromInfoviewer = false;
}
else
callInfoViewer();
update_lcd = true; update_lcd = true;
clearSubtitle(); clearSubtitle();
} else if (timeshift != TSHIFT_MODE_OFF && (msg == CRCInput::RC_text || msg == CRCInput::RC_epg || msg == NeutrinoMessages::SHOW_EPG)) { } else if (timeshift != TSHIFT_MODE_OFF && (msg == CRCInput::RC_text || msg == CRCInput::RC_epg || msg == NeutrinoMessages::SHOW_EPG)) {