zapit: improve the lockPlayBack "nonblank-Hack"

This commit is contained in:
Stefan Seyfried
2014-01-13 21:09:03 +01:00
committed by svenhoefer
parent 84dff7ea59
commit 1640784844
2 changed files with 4 additions and 7 deletions

View File

@@ -198,7 +198,7 @@ class CZapit : public OpenThreads::Thread
void LoadVolumeMap();
void SaveChannelPids(CZapitChannel* channel);
virtual void ConfigFrontend();
bool StopPlayBack(bool send_pmt);
bool StopPlayBack(bool send_pmt, bool blank = true);
virtual void leaveStandby();
static CZapit * zapit;

View File

@@ -1617,10 +1617,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
#endif
case CZapitMessages::CMD_SB_LOCK_PLAYBACK:
/* hack. if standby true, dont blank video */
standby = true;
StopPlayBack(true);
standby = false;
StopPlayBack(msgBool.truefalse, false);
playbackStopForced = true;
lock_channel_id = live_channel_id;
SendCmdReady(connfd);
@@ -2103,7 +2100,7 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
return true;
}
bool CZapit::StopPlayBack(bool send_pmt)
bool CZapit::StopPlayBack(bool send_pmt, bool blank)
{
if(send_pmt)
CCamManager::getInstance()->Stop(live_channel_id, CCamManager::PLAY);
@@ -2122,7 +2119,7 @@ bool CZapit::StopPlayBack(bool send_pmt)
audioDecoder->Stop();
/* hack. if standby, dont blank video -> for paused timeshift */
videoDecoder->Stop(standby ? false : true);
videoDecoder->Stop(standby ? false : blank);
#ifdef USE_VBI
videoDecoder->StopVBI();
#endif