mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

- glcd: fix rec/ts icon handling ...

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

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-07-02 23:38:23 +02:00
committed by Thilo Graf
parent c4c6b32197
commit 354e1971e3
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/glcd/glcd.cpp
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; int icon_start_width = 0, icon_start_height = 0;
g_PicViewer->getSize(Logo.c_str(), &icon_start_width, &icon_start_height); g_PicViewer->getSize(Logo.c_str(), &icon_start_width, &icon_start_height);

10
src/driver/record.cpp
View File

@@ -307,16 +307,6 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
CCamManager::getInstance()->Start(channel->getChannelID(), CCamManager::RECORD); CCamManager::getInstance()->Start(channel->getChannelID(), CCamManager::RECORD);
//CVFD::getInstance()->ShowIcon(VFD_ICON_CAM1, true); //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); WaitRecMsg(msg_start_time, 2);
hintBox.hide(); hintBox.hide();
return RECORD_OK; return RECORD_OK;