- adzap: add "zap on timer activation" to adzap menu too

This commit is contained in:
Jacek Jendrzej
2019-04-28 18:34:24 +02:00
committed by Thilo Graf
parent c9d6285091
commit f4b98498c3
3 changed files with 26 additions and 15 deletions

View File

@@ -1248,22 +1248,11 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
tmp_msg += to_string(g_settings.adzap_zapBackPeriod / 60);
tmp_msg += " ";
tmp_msg += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
ShowMsg(LOCALE_ADZAP, tmp_msg, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
if (g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_LAST)
{
CNeutrinoApp::getInstance()->channelList->numericZap(g_settings.key_lastchannel);
}
else if (g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_START)
{
int mode = CNeutrinoApp::getInstance()->getMode();
bool isRadioMode = (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio);
const t_channel_id cur_channel_id = isRadioMode ? g_settings.startchannelradio_id : g_settings.startchanneltv_id;
if (cur_channel_id != channel_id)
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(cur_channel_id, true);
else
CNeutrinoApp::getInstance()->channelList->numericZap(g_settings.key_lastchannel);
}
if (g_settings.adzap_zapOnActivation != SNeutrinoSettings::ADZAP_ZAP_OFF)
CAdZapMenu::getInstance()->Zap_On_Activation(channel_id);
ShowMsg(LOCALE_ADZAP, tmp_msg, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
}
//CTimerdClient timerdclient;
else if (g_Timerd->isTimerdAvailable())