From 06279d40c8aa7257cc16a0c8df9b79c6cbcf3a90 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 2 Jul 2020 23:38:23 +0200 Subject: [PATCH] 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: https://github.com/neutrino-images/ni-neutrino/commit/fa290c088226e96b80dd38dc8acbae7ad21db6f0 Author: vanhofen 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 --- src/driver/glcd/glcd.cpp | 18 ++++++++++++++++++ src/driver/record.cpp | 10 ---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index 7a64e884a..7a242f8e0 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -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); diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 3ea9dee02..e36613fc2 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -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;