mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "zapit: improve the lockPlayBack "nonblank-Hack""

Browse Source 
This reverts commit 56f22a0a53 because previous changes are missing.


Origin commit data
------------------
Commit: 51a46646a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-13 (Mon, 13 Jan 2014)
This commit is contained in:
vanhofen
2014-01-13 21:22:40 +01:00
parent 56f22a0a53
commit 1df3079b67
2 changed files with 7 additions and 4 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 blank = true); bool StopPlayBack(bool send_pmt);
virtual void leaveStandby(); virtual void leaveStandby();
static CZapit * zapit; static CZapit * zapit;

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

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