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

channellist: move avoid-zap-in-movieplayer-mode-message ...

Browse Source 
... to a global reachable place to avoid all zap tries


Origin commit data
------------------
Commit: 984e187855
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)

Origin message was:
------------------
- channellist: move avoid-zap-in-movieplayer-mode-message ...

... to a global reachable place to avoid all zap tries
This commit is contained in:
vanhofen
2018-07-29 00:54:55 +02:00
parent ac6bf7ce05
commit 848877367b
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/channellist.cpp
View File

@@ -778,8 +778,6 @@ int CChannelList::show()
actzap = true; actzap = true;
oldselected = selected; oldselected = selected;
paintBody(); // refresh zapped vs selected paintBody(); // refresh zapped vs selected
} else if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts) {
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEPLAYER_ZAP);
} else if(SameTP()) { } else if(SameTP()) {
zapOnExit = true; zapOnExit = true;
loop=false; loop=false;
@@ -960,10 +958,6 @@ int CChannelList::show()
printf("CChannelList:: bouquetList->exec res %d\n", res); printf("CChannelList:: bouquetList->exec res %d\n", res);
} }
if(NeutrinoModes::mode_ts == CNeutrinoApp::getInstance()->getMode())
return -1;
if(zapOnExit) if(zapOnExit)
res = selected; res = selected;
@@ -1208,6 +1202,12 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
if(channel == NULL) if(channel == NULL)
return; return;
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts)
{
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEPLAYER_ZAP);
return;
}
/* we record when we switched away from a channel, so that the parental-PIN code can /* we record when we switched away from a channel, so that the parental-PIN code can
check for timeout. last_unlocked_time == 0 means: the PIN was not entered check for timeout. last_unlocked_time == 0 means: the PIN was not entered
"tuned" is the *old* channel, before zap */ "tuned" is the *old* channel, before zap */

5
src/gui/epgplus.cpp
View File

@@ -1081,10 +1081,7 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
{ {
if (selectedChannelEntry) if (selectedChannelEntry)
{ {
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts) CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(selectedChannelEntry->channel->getChannelID());
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEPLAYER_ZAP);
else
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(selectedChannelEntry->channel->getChannelID());
} }
current_bouquet = bouquetList->getActiveBouquetNumber(); current_bouquet = bouquetList->getActiveBouquetNumber();
} }