mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
adzap: add tzap to monitor mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: d983672a86
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-05-05 (Sun, 05 May 2019)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -261,7 +261,7 @@ int CAdZapMenu::exec(CMenuTarget *parent, const std::string & actionKey)
|
|||||||
armed = true;
|
armed = true;
|
||||||
alerted = false;
|
alerted = false;
|
||||||
Update();
|
Update();
|
||||||
if (CNeutrinoApp::getInstance()->channelList && g_settings.adzap_zapOnActivation != SNeutrinoSettings::ADZAP_ZAP_OFF)
|
if (g_settings.adzap_zapOnActivation != SNeutrinoSettings::ADZAP_ZAP_OFF && CNeutrinoApp::getInstance()->channelList)
|
||||||
Zap_On_Activation(CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID());
|
Zap_On_Activation(CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID());
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
@@ -283,6 +283,8 @@ int CAdZapMenu::exec(CMenuTarget *parent, const std::string & actionKey)
|
|||||||
monitorLifeTime.tv_sec = getMonitorLifeTime();
|
monitorLifeTime.tv_sec = getMonitorLifeTime();
|
||||||
printf("CAdZapMenu::%s: monitorLifeTime.tv_sec: %d\n", __func__, (uint) monitorLifeTime.tv_sec);
|
printf("CAdZapMenu::%s: monitorLifeTime.tv_sec: %d\n", __func__, (uint) monitorLifeTime.tv_sec);
|
||||||
Update();
|
Update();
|
||||||
|
if (g_settings.adzap_zapOnActivation != SNeutrinoSettings::ADZAP_ZAP_OFF && CNeutrinoApp::getInstance()->channelList)
|
||||||
|
Zap_On_Activation(CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID());
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
if (actionKey == "adzap")
|
if (actionKey == "adzap")
|
||||||
|
Reference in New Issue
Block a user