mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 09:51:13 +02:00
channellist::zapToChannel: speed up playback
on channels without EPG on pre-locked bouquets, playback was delayed
until EPG times out (about 10seconds), even if parental control is
globally disabled. Check for parentallock global setting and start video
always if enabled.
Origin commit data
------------------
Branch: ni/coolstream
Commit: e30d00c4c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2021-10-18 (Mon, 18 Oct 2021)
------------------
This commit was generated by Migit
This commit is contained in:
committed by
vanhofen
parent
44a945295b
commit
c8e80b2cb3
@@ -1264,7 +1264,9 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
|
||||
}
|
||||
|
||||
selected_chid = channel->getChannelID();
|
||||
g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), channel->number, (channel->Locked() == g_settings.parentallock_defaultlocked));
|
||||
bool startvideo = (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_NEVER) ||
|
||||
(channel->Locked() == g_settings.parentallock_defaultlocked);
|
||||
g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), channel->number, startvideo);
|
||||
CNeutrinoApp::getInstance()->adjustToChannelID(channel->getChannelID());
|
||||
}
|
||||
if(new_zap_mode != 2 /* not active */) {
|
||||
|
Reference in New Issue
Block a user