Compile again with VDR < 2.3.0

This commit is contained in:
kamel5 2019-03-28 14:59:16 +01:00
parent 4474b5f5b5
commit 7ca598f64e
2 changed files with 9 additions and 1 deletions

View File

@ -145,12 +145,16 @@ void cEpgGrid::drawText() {
drawIcon("Switch", theme.Color(clrButtonYellow)); drawIcon("Switch", theme.Color(clrButtonYellow));
if (hasTimer) { if (hasTimer) {
const cTimer *timer = NULL; const cTimer *timer = NULL;
#if VDRVERSNUM >= 20301
{ {
LOCK_TIMERS_READ; LOCK_TIMERS_READ;
timer = Timers->GetMatch(event); timer = Timers->GetMatch(event);
} }
#else
timer = Timers.GetMatch(event);
#endif
if (timer) if (timer)
#ifdef USE_SWITCHONLY #ifdef SWITCHONLYPATCH
if (timer->HasFlags(tfSwitchOnly)) if (timer->HasFlags(tfSwitchOnly))
drawIcon("Switch", theme.Color(clrButtonYellow)); drawIcon("Switch", theme.Color(clrButtonYellow));
else if (timer->HasFlags(tfActive)) else if (timer->HasFlags(tfActive))

View File

@ -764,10 +764,14 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) { if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
timer = menu->GetOriginalTimer(); timer = menu->GetOriginalTimer();
} else break; } else break;
#if VDRVERSNUM >= 20301
{ {
LOCK_TIMERS_WRITE; LOCK_TIMERS_WRITE;
recManager->DeleteTimer(Timers->GetTimer(timer)); recManager->DeleteTimer(Timers->GetTimer(timer));
} }
#else
recManager->DeleteTimer(Timers.GetTimer(timer));
#endif
delete activeMenu; delete activeMenu;
if (timerConflicts) { if (timerConflicts) {
delete timerConflicts; delete timerConflicts;