mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +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

19
src/timerd/timermanager.cpp
View File

@@ -44,6 +44,8 @@
#include "timermanager.h"
#include <system/set_threadname.h>
#include <driver/display.h>
extern bool timeset;
time_t timer_minutes;
bool timer_is_rec;
@@ -93,6 +95,8 @@ void* CTimerManager::timerThread(void *arg)
CTimerManager *timerManager = (CTimerManager*) arg;
bool setTimerIcon = false;
int sleeptime=(timerd_debug)?10:20;
while(1)
{
@@ -126,6 +130,12 @@ void* CTimerManager::timerThread(void *arg)
CTimerEventMap::iterator pos = timerManager->events.begin();
for(;pos != timerManager->events.end();++pos)
{
#ifdef ENABLE_GRAPHLCD
if (!setTimerIcon) {
cGLCD::lockIcon(cGLCD::TIMER);
setTimerIcon = true;
}
#endif
event = pos->second;
dprintf("checking event: %03d\n",event->eventID);
if (timerd_debug)
@@ -149,6 +159,12 @@ void* CTimerManager::timerThread(void *arg)
if(event->stopTime == 0) // if event needs no stop event
event->setState(CTimerd::TIMERSTATE_HASFINISHED);
timerManager->m_saveEvents = true;
#ifdef ENABLE_GRAPHLCD
if (setTimerIcon) {
cGLCD::unlockIcon(cGLCD::TIMER);
setTimerIcon = false;
}
#endif
}
if(event->stopTime > 0 && event->eventState == CTimerd::TIMERSTATE_ISRUNNING ) // check if stopevent is wanted
@@ -223,6 +239,9 @@ CTimerEvent* CTimerManager::getNextEvent()
//------------------------------------------------------------
int CTimerManager::addEvent(CTimerEvent* evt, bool save)
{
#ifdef ENABLE_GRAPHLCD
cGLCD::lockIcon(cGLCD::TIMER);
#endif
pthread_mutex_lock(&tm_eventsMutex);
eventID++; // increase unique event id
evt->eventID = eventID;