mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit: improve the lockPlayBack "nonblank-Hack"

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zapit/include/zapit/zapit.h
View File

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

9
src/zapit/src/zapit.cpp
View File

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