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

update glcd

Browse Source 
Conflicts:
	src/gui/movieplayer.h
	src/gui/weather_locations.h
	src/neutrino.cpp
This commit is contained in:
redblue-pkt
2020-06-19 23:56:12 +02:00
committed by Thilo Graf
parent 6435b167e5
commit 1b6f4fedf5
118 changed files with 6154 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/driver/record.cpp
View File

@@ -307,6 +307,16 @@ 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;
@@ -351,6 +361,9 @@ bool CRecordInstance::Stop(bool remove_event)
recording_id = 0;
}
//CVFD::getInstance()->ShowIcon(VFD_ICON_CAM1, false);
#ifdef ENABLE_GRAPHLCD
cGLCD::unlockIcon(cGLCD::REC);
#endif
WaitRecMsg(end_time, 2);
hintBox.hide();
return true;
@@ -1090,7 +1103,7 @@ bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, cons
recordingstatus = 1;
#endif
#ifdef ENABLE_GRAPHLCD
nGLCD::Update();
cGLCD::Update();
#endif
} else {
delete inst;
@@ -1294,7 +1307,7 @@ bool CRecordManager::Stop(const CTimerd::RecordingStopInfo * recinfo)
StopInstance(inst, false);
ret = true;
#ifdef ENABLE_GRAPHLCD
nGLCD::Update();
cGLCD::Update();
#endif
} else {
for(nextmap_iterator_t it = nextmap.begin(); it != nextmap.end(); it++) {