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

zapit: improve the lockPlayBack "nonblank-Hack"

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9476627ac5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-12 15:26:34 +01:00
parent 525fd6261b
commit f740dbde59
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

@@ -195,7 +195,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

@@ -1693,10 +1693,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
{ {
CZapitMessages::commandBoolean msgBool; CZapitMessages::commandBoolean msgBool;
CBasicServer::receive_data(connfd, &msgBool, sizeof(msgBool)); CBasicServer::receive_data(connfd, &msgBool, sizeof(msgBool));
/* hack. if standby true, dont blank video */ StopPlayBack(msgBool.truefalse, false);
standby = true;
StopPlayBack(msgBool.truefalse);
standby = false;
playbackStopForced = true; playbackStopForced = true;
lock_channel_id = live_channel_id; lock_channel_id = live_channel_id;
SendCmdReady(connfd); SendCmdReady(connfd);
@@ -2205,7 +2202,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);
@@ -2234,7 +2231,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);
#endif #endif
#ifdef USE_VBI #ifdef USE_VBI
videoDecoder->StopVBI(); videoDecoder->StopVBI();