glcd: fix rec/ts icon handling ...

Maybe it's a good idea to handle all the glcd-icons directly in glcd code.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fa290c0882
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-02 (Thu, 02 Jul 2020)

Origin message was:
------------------
- glcd: fix rec/ts icon handling ...

Maybe it's a good idea to handle all the glcd-icons directly in glcd code.


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-07-02 23:38:23 +02:00
parent 2d48b97edf
commit 06279d40c8
2 changed files with 18 additions and 10 deletions

View File

@@ -300,6 +300,24 @@ void cGLCD::Exec()
;
}
switch (CRecordManager::getInstance()->GetRecordMode())
{
case CRecordManager::RECMODE_REC_TSHIFT:
recLocked = true;
tsLocked = true;
break;
case CRecordManager::RECMODE_REC:
recLocked = true;
break;
case CRecordManager::RECMODE_TSHIFT:
tsLocked = true;
break;
default:
recLocked = false;
tsLocked = false;
break;
}
int icon_start_width = 0, icon_start_height = 0;
g_PicViewer->getSize(Logo.c_str(), &icon_start_width, &icon_start_height);

View File

@@ -310,16 +310,6 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
CCamManager::getInstance()->Start(channel->getChannelID(), CCamManager::RECORD);
//CVFD::getInstance()->ShowIcon(VFD_ICON_CAM1, true);
#ifdef ENABLE_GRAPHLCD
if (CRecordManager::getInstance()->GetRecordMode() == CRecordManager::RECMODE_REC)
cGLCD::lockIcon(cGLCD::REC);
else if (CRecordManager::getInstance()->GetRecordMode() == CRecordManager::RECMODE_TSHIFT)
cGLCD::lockIcon(cGLCD::TS);
else if (CRecordManager::getInstance()->GetRecordMode() == CRecordManager::RECMODE_REC_TSHIFT) {
cGLCD::lockIcon(cGLCD::REC);
cGLCD::lockIcon(cGLCD::TS);
}
#endif
WaitRecMsg(msg_start_time, 2);
hintBox.hide();
return RECORD_OK;