mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- channellist: move zaphistory/current_transponder handling into sepatate function

Browse Source 
Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-03-22 00:09:41 +01:00
committed by Thilo Graf
parent 1bf83a035f
commit ef99e41f93
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/gui/channellist.cpp
View File

@@ -1220,36 +1220,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)
{
@@ -1306,7 +1282,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();