diff options
Diffstat (limited to 'menu_whatson.c')
| -rw-r--r-- | menu_whatson.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/menu_whatson.c b/menu_whatson.c index 2c85b10..7f7dab3 100644 --- a/menu_whatson.c +++ b/menu_whatson.c @@ -63,6 +63,7 @@ cMenuMyScheduleItem::cMenuMyScheduleItem(const cTimers *Timers, const cEvent *Ev timerMatch = tmNone; isRemote = false; inSwitchList = false; + timerActive = false; menuTemplate = MenuTemplate; Update(Timers, true); } @@ -81,15 +82,17 @@ bool cMenuMyScheduleItem::Update(const cTimers* Timers, bool Force) eTimerMatch OldTimerMatch = timerMatch; bool OldIsRemote = isRemote; bool OldInSwitchList = inSwitchList; + bool OldtimerActive = timerActive; bool hasMatch = false; const cTimer* timer = NULL; if (event) timer = Timers->GetMatch(event, &timerMatch); if (event) inSwitchList = (SwitchTimers.InSwitchList(event)!=NULL); if (timer) hasMatch = true; + if (timer) timerActive = timer->HasFlags(tfActive); if (timer) isRemote = timer->Remote(); if (Force || timerMatch != OldTimerMatch || inSwitchList != OldInSwitchList - || isRemote != OldIsRemote) + || isRemote != OldIsRemote || timerActive != OldtimerActive) { char szProgressPart[Utf8BufSize(12)] = ""; char szProgressPartT2S[12] = ""; @@ -159,7 +162,7 @@ bool cMenuMyScheduleItem::Update(const cTimers* Timers, bool Force) { if (!isUTF8) { - t[0] = event && hasMatch ? (timerMatch == tmFull) ? ((timer && timer->Recording())?ICON_REC:ICON_CLOCK) : ICON_CLOCK_HALF : ' '; + t[0] = event && hasMatch ? (timerMatch == tmFull) ? ((timer && timer->Recording()) ? ICON_REC : (timerActive ? ICON_CLOCK : ICON_TIMER_INACT)) : (timerActive ? ICON_CLOCK_HALF : ' ' ): ' '; v[0] = event && event->Vps() && (event->Vps() - event->StartTime()) ? ICON_VPS : ' '; r[0] = event && event->IsRunning() ? ICON_RUNNING : ' '; } @@ -167,7 +170,7 @@ bool cMenuMyScheduleItem::Update(const cTimers* Timers, bool Force) { #if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 96 #else - sprintf(t, "%s", (event && hasMatch ? (timerMatch == tmFull) ? ((timer && timer->Recording())?ICON_REC_UTF8:ICON_CLOCK_UTF8) : ICON_CLOCK_HALF_UTF8 : " ")); + sprintf(t, "%s", (event && hasMatch ? (timerMatch == tmFull) ? ((timer && timer->Recording()) ? ICON_REC_UTF8 : (timerActive ? ICON_CLOCK_UTF8 : ICON_TIMER_INACT_UTF8)) : (timerActive ? ICON_CLOCK_HALF_UTF8 : " ") : " ")); sprintf(v, "%s", event && event->Vps() && (event->Vps() - event->StartTime()) ? ICON_VPS_UTF8 : " "); sprintf(r, "%s", (event && event->IsRunning() ? ICON_RUNNING_UTF8 : " ")); #endif @@ -175,7 +178,7 @@ bool cMenuMyScheduleItem::Update(const cTimers* Timers, bool Force) } else { - t[0] = event && hasMatch ? (timerMatch == tmFull) ? ((timer && timer->Recording())?'R':'T') : 't' : ' '; + t[0] = event && hasMatch ? (timerMatch == tmFull) ? ((timer && timer->Recording()) ? 'R' : (timerActive ? 'T' : 'i')) : (timerActive ? 't' : ' ') : ' '; v[0] = event && event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' '; r[0] = event && event->IsRunning() ? '*' : ' '; } |