mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-03 19:01:25 +02:00
zapit/src/zapit.cpp: when zapping to webtv, make sure
dvb subtitles stopped and channel pids saved
This commit is contained in:
@@ -505,8 +505,14 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
|
|||||||
}
|
}
|
||||||
|
|
||||||
INFO("[zapit] zap to %s (%" PRIx64 " tp %" PRIx64 ")", newchannel->getName().c_str(), newchannel->getChannelID(), newchannel->getTransponderId());
|
INFO("[zapit] zap to %s (%" PRIx64 " tp %" PRIx64 ")", newchannel->getName().c_str(), newchannel->getChannelID(), newchannel->getTransponderId());
|
||||||
|
if (!firstzap && current_channel)
|
||||||
|
SaveChannelPids(current_channel);
|
||||||
|
|
||||||
|
/* firstzap right now does nothing but control saving the audio channel */
|
||||||
|
firstzap = false;
|
||||||
|
|
||||||
if (IS_WEBTV(newchannel->getChannelID()) && !newchannel->getUrl().empty()) {
|
if (IS_WEBTV(newchannel->getChannelID()) && !newchannel->getUrl().empty()) {
|
||||||
|
dvbsub_stop();
|
||||||
if (!IS_WEBTV(live_channel_id))
|
if (!IS_WEBTV(live_channel_id))
|
||||||
CCamManager::getInstance()->Stop(live_channel_id, CCamManager::PLAY);
|
CCamManager::getInstance()->Stop(live_channel_id, CCamManager::PLAY);
|
||||||
|
|
||||||
@@ -540,12 +546,6 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
sig_delay = 2;
|
sig_delay = 2;
|
||||||
if (!firstzap && current_channel)
|
|
||||||
SaveChannelPids(current_channel);
|
|
||||||
|
|
||||||
/* firstzap right now does nothing but control saving the audio channel */
|
|
||||||
firstzap = false;
|
|
||||||
|
|
||||||
pmt_stop_update_filter(&pmt_update_fd);
|
pmt_stop_update_filter(&pmt_update_fd);
|
||||||
|
|
||||||
/* stop playback on the old frontend... */
|
/* stop playback on the old frontend... */
|
||||||
|
Reference in New Issue
Block a user