summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Melscher <kamel5@gmx.net>2018-03-07 15:47:54 +0100
committerKarl Melscher <kamel5@gmx.net>2018-03-07 15:47:54 +0100
commit125eb9aa40f2b552e816f4ebff67d2e77449e770 (patch)
treee350d1c2c51d1bb56f5ddabeeccaa2675ffd2216
parent994639fbb408137c603fb1da82eccf358dca735b (diff)
downloadskin-lcarsng-125eb9aa40f2b552e816f4ebff67d2e77449e770.tar.gz
skin-lcarsng-125eb9aa40f2b552e816f4ebff67d2e77449e770.tar.bz2
Changes for VDR 2.3.x
-rw-r--r--lcarsng.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/lcarsng.c b/lcarsng.c
index a171686..c72e3d9 100644
--- a/lcarsng.c
+++ b/lcarsng.c
@@ -1803,15 +1803,20 @@ void cLCARSNGDisplayMenu::SetTitle(const char *Title)
osd->DrawRectangle(xs12, ys00, xs13 - 1, ys01 - 1, frameColor);
int NumTimers = 0;
#if APIVERSNUM > 20300
- LOCK_TIMERS_READ;
- for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) {
+ if (const cTimers *Timers = cTimers::GetTimersRead(timersStateKey)) {
+ for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) {
#else
- for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
+ if (Timers.Modified(lastTimersState)) {
+ for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
+#endif
+ if (Timer->HasFlags(tfActive))
+ NumTimers++;
+ }
+ osd->DrawText(xs00, ys00, itoa(NumTimers), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder);
+#if APIVERSNUM > 20300
+ timersStateKey.Remove();
#endif
- if (Timer->HasFlags(tfActive))
- NumTimers++;
}
- osd->DrawText(xs00, ys00, itoa(NumTimers), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder);
}
break;
default: