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

channellist: move zaphistory/current_transponder handling into sepatate function

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dbd41921a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-22 (Thu, 22 Mar 2018)

Origin message was:
------------------
- channellist: move zaphistory/current_transponder handling into sepatate function

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-03-22 00:09:41 +01:00
parent a11ed4ffe9
commit 0d3d142017
3 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/gui/channellist.cpp
View File

@@ -1237,36 +1237,12 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
}
}
/* Called only from "all" channel list */
int CChannelList::numericZap(int key)
int CChannelList::showLiveBouquet(int key)
{
int res = -1;
if (showEmptyError())
return res;
/*
TODO?
Move handling of key_zaphistory and key_current_transponder
into sepatate functions?
These keys do not zap numeric. Pseudo bouquets are shown.
*/
// quickzap "0" to last seen channel
if (key == g_settings.key_lastchannel)
{
t_channel_id channel_id = lastChList.getlast(1);
if (channel_id && SameTP(channel_id))
{
lastChList.clear_storedelay(); // ignore store delay
int new_mode = lastChList.get_mode(channel_id);
if (new_mode >= 0)
CNeutrinoApp::getInstance()->SetChannelMode(new_mode);
zapTo_ChannelID(channel_id);
res = 0;
}
return res;
}
// zap history bouquet
if (key == g_settings.key_zaphistory)
{
@@ -1323,7 +1299,33 @@ int CChannelList::numericZap(int key)
return res;
}
// real numeric zap
return res;
}
/* Called only from "all" channel list */
int CChannelList::numericZap(int key)
{
int res = -1;
if (showEmptyError())
return res;
// quickzap "0" to last seen channel
if (key == g_settings.key_lastchannel)
{
t_channel_id channel_id = lastChList.getlast(1);
if (channel_id && SameTP(channel_id))
{
lastChList.clear_storedelay(); // ignore store delay
int new_mode = lastChList.get_mode(channel_id);
if (new_mode >= 0)
CNeutrinoApp::getInstance()->SetChannelMode(new_mode);
zapTo_ChannelID(channel_id);
res = 0;
}
return res;
}
// numeric zap
size_t maxchansize = MaxChanNr().size();
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getMaxDigitWidth();
int fh = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getHeight();

1
src/gui/channellist.h
View File

@@ -214,6 +214,7 @@ public:
bool adjustToChannelID(const t_channel_id channel_id);
bool showInfo(int pos, int epgpos = 0);
void updateEvents(unsigned int from, unsigned int to);
int showLiveBouquet(int key);
int numericZap(int key);
int show();
int exec();

14
src/neutrino.cpp
View File

@@ -2708,7 +2708,7 @@ void CNeutrinoApp::quickZap(int msg)
else
ret = channelList->quickZap(msg);
if (!ret) {
res = channelList->numericZap(g_settings.key_zaphistory);
res = channelList->showLiveBouquet(g_settings.key_zaphistory);
StartSubtitles(res < 0);
}
}
@@ -2924,12 +2924,7 @@ void CNeutrinoApp::RealRun()
if (g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_POPUP)
InfoIcons->hideIcons();
}
InfoClock->enableInfoClock(false);
InfoIcons->enableInfoIcons(false); //NI InfoIcons
numericZap(msg);
InfoClock->enableInfoClock(true);
InfoIcons->enableInfoIcons(true); //NI InfoIcons
showChannelList(msg);
}
#ifdef SCREENSHOT
else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
@@ -3042,8 +3037,7 @@ void CNeutrinoApp::RealRun()
StartSubtitles();
}
else if (CRCInput::isNumeric(msg)) {
numericZap( msg );
numericZap(msg);
}
/* FIXME ??? */
else if (CRCInput::isNumeric(msg) && g_RemoteControl->director_mode ) {
@@ -3181,7 +3175,7 @@ int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu)
SetChannelMode(LIST_MODE_PROV);
nNewChannel = bouquetList->exec(true);
} else if (msg == (neutrino_msg_t) g_settings.key_zaphistory || msg == (neutrino_msg_t) g_settings.key_current_transponder) {
channelList->numericZap(msg);
channelList->showLiveBouquet(msg);
}
_repeat:
printf("CNeutrinoApp::showChannelList: nNewChannel %d\n", nNewChannel);fflush(stdout);