mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 01:41:12 +02:00
neutrino.cpp: remove StartAutoRecord on leaving standby - auto-timeshift started later anyway
Origin commit data
------------------
Branch: ni/coolstream
Commit: 12eee1db1e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -3170,7 +3170,7 @@ void CNeutrinoApp::scartMode( bool bOnOff )
|
|||||||
|
|
||||||
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
||||||
{
|
{
|
||||||
static bool wasshift = false;
|
//static bool wasshift = false;
|
||||||
INFO("%s", bOnOff ? "ON" : "OFF" );
|
INFO("%s", bOnOff ? "ON" : "OFF" );
|
||||||
|
|
||||||
if( bOnOff ) {
|
if( bOnOff ) {
|
||||||
@@ -3188,7 +3188,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
|||||||
CVFD::getInstance()->Clear();
|
CVFD::getInstance()->Clear();
|
||||||
CVFD::getInstance()->setMode(CVFD::MODE_STANDBY);
|
CVFD::getInstance()->setMode(CVFD::MODE_STANDBY);
|
||||||
|
|
||||||
wasshift = CRecordManager::getInstance()->StopAutoRecord();
|
/* wasshift = */ CRecordManager::getInstance()->StopAutoRecord();
|
||||||
|
|
||||||
if(!CRecordManager::getInstance()->RecordingStatus()) {
|
if(!CRecordManager::getInstance()->RecordingStatus()) {
|
||||||
g_Zapit->setStandby(true);
|
g_Zapit->setStandby(true);
|
||||||
@@ -3297,11 +3297,15 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
|||||||
InfoClock->StartClock();
|
InfoClock->StartClock();
|
||||||
|
|
||||||
g_volume->AudioMute(current_muted, true);
|
g_volume->AudioMute(current_muted, true);
|
||||||
|
#if 0
|
||||||
|
/* auto-record will be started when zap is complete
|
||||||
|
* FIXME is it needed to restart manual timeshift here ? */
|
||||||
if((mode == mode_tv) && wasshift) {
|
if((mode == mode_tv) && wasshift) {
|
||||||
//startAutoRecord();
|
//startAutoRecord();
|
||||||
CRecordManager::getInstance()->StartAutoRecord();
|
CRecordManager::getInstance()->StartAutoRecord();
|
||||||
}
|
}
|
||||||
wasshift = false;
|
wasshift = false;
|
||||||
|
#endif
|
||||||
StartSubtitles();
|
StartSubtitles();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user