From 906f2092042f8a7336c9e68bc62f087fb028690c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 13 Jan 2014 21:22:40 +0100 Subject: [PATCH] Revert "zapit: improve the lockPlayBack "nonblank-Hack"" This reverts commit 3560801e4a61ca983e3c9aa64bae24f50b6515ba because previous changes are missing. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/51a46646a8c980f0272c48768c4de01962ef94bb Author: vanhofen Date: 2014-01-13 (Mon, 13 Jan 2014) ------------------ This commit was generated by Migit --- src/zapit/include/zapit/zapit.h | 2 +- src/zapit/src/zapit.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 00b8e4da6..9be18fe7f 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -198,7 +198,7 @@ class CZapit : public OpenThreads::Thread void LoadVolumeMap(); void SaveChannelPids(CZapitChannel* channel); virtual void ConfigFrontend(); - bool StopPlayBack(bool send_pmt, bool blank = true); + bool StopPlayBack(bool send_pmt); virtual void leaveStandby(); static CZapit * zapit; diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 9ba547180..f09d76532 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -1617,7 +1617,10 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd) #endif 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; lock_channel_id = live_channel_id; SendCmdReady(connfd); @@ -2100,7 +2103,7 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel) return true; } -bool CZapit::StopPlayBack(bool send_pmt, bool blank) +bool CZapit::StopPlayBack(bool send_pmt) { if(send_pmt) CCamManager::getInstance()->Stop(live_channel_id, CCamManager::PLAY); @@ -2119,7 +2122,7 @@ bool CZapit::StopPlayBack(bool send_pmt, bool blank) audioDecoder->Stop(); /* hack. if standby, dont blank video -> for paused timeshift */ - videoDecoder->Stop(standby ? false : blank); + videoDecoder->Stop(standby ? false : true); #ifdef USE_VBI videoDecoder->StopVBI(); #endif