mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
driver/scanepg.cpp, neutrino.cpp: fix for standby epg scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a120da68d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -208,6 +208,7 @@ void CEpgScan::EnterStandby()
|
|||||||
{
|
{
|
||||||
if (standby) {
|
if (standby) {
|
||||||
CZapit::getInstance()->SetCurrentChannelID(live_channel_id);
|
CZapit::getInstance()->SetCurrentChannelID(live_channel_id);
|
||||||
|
CZapit::getInstance()->EnablePlayback(true);
|
||||||
g_Zapit->setStandby(true);
|
g_Zapit->setStandby(true);
|
||||||
g_Sectionsd->setPauseScanning(true);
|
g_Sectionsd->setPauseScanning(true);
|
||||||
}
|
}
|
||||||
|
@@ -3283,7 +3283,8 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
|||||||
if(!g_settings.epg_scan && !fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus() && !stream_status) {
|
if(!g_settings.epg_scan && !fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus() && !stream_status) {
|
||||||
g_Zapit->setStandby(true);
|
g_Zapit->setStandby(true);
|
||||||
} else {
|
} else {
|
||||||
g_Zapit->stopPlayBack();
|
//g_Zapit->stopPlayBack();
|
||||||
|
g_Zapit->lockPlayBack();
|
||||||
}
|
}
|
||||||
|
|
||||||
videoDecoder->Standby(true);
|
videoDecoder->Standby(true);
|
||||||
@@ -3359,6 +3360,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
|||||||
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
|
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
|
||||||
CVFD::getInstance()->setBacklight(g_settings.backlight_tv);
|
CVFD::getInstance()->setBacklight(g_settings.backlight_tv);
|
||||||
|
|
||||||
|
CZapit::getInstance()->EnablePlayback(true);
|
||||||
g_Zapit->setStandby(false);
|
g_Zapit->setStandby(false);
|
||||||
/* the old code did:
|
/* the old code did:
|
||||||
if(was_record) g_Zapit->startPlayBack()
|
if(was_record) g_Zapit->startPlayBack()
|
||||||
|
Reference in New Issue
Block a user