mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 17:31:11 +02:00
zapit: fix order of stopping playback and selecting live FE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f3561104e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-24 (Sun, 24 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
committed by
vanhofen
parent
0d0928b156
commit
f9d64f5a4a
@@ -479,9 +479,6 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
|
|||||||
ERROR("Cannot get frontend\n");
|
ERROR("Cannot get frontend\n");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
live_fe = fe;
|
|
||||||
CFEManager::getInstance()->setLiveFE(live_fe);
|
|
||||||
|
|
||||||
sig_delay = 2;
|
sig_delay = 2;
|
||||||
if (!firstzap && current_channel)
|
if (!firstzap && current_channel)
|
||||||
SaveChannelPids(current_channel);
|
SaveChannelPids(current_channel);
|
||||||
@@ -491,8 +488,13 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
|
|||||||
|
|
||||||
pmt_stop_update_filter(&pmt_update_fd);
|
pmt_stop_update_filter(&pmt_update_fd);
|
||||||
|
|
||||||
|
/* stop playback on the old frontend... */
|
||||||
StopPlayBack(!forupdate);
|
StopPlayBack(!forupdate);
|
||||||
|
|
||||||
|
/* then select the new one... */
|
||||||
|
live_fe = fe;
|
||||||
|
CFEManager::getInstance()->setLiveFE(live_fe);
|
||||||
|
|
||||||
if(!forupdate && current_channel)
|
if(!forupdate && current_channel)
|
||||||
current_channel->resetPids();
|
current_channel->resetPids();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user