diff options
Diffstat (limited to 'recmenuview.c')
| -rw-r--r-- | recmenuview.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/recmenuview.c b/recmenuview.c index f8a5493..74e6f2b 100644 --- a/recmenuview.c +++ b/recmenuview.c @@ -93,7 +93,6 @@ void cRecMenuView::DisplaySearchTimerList(void) { } bool cRecMenuView::DisplayTimerConflict(const cTimer *timer) { - int timerID = 0; #if VDRVERSNUM >= 20301 LOCK_TIMERS_READ; for (const cTimer *t = Timers->First(); t; t = Timers->Next(t)) { @@ -101,8 +100,7 @@ bool cRecMenuView::DisplayTimerConflict(const cTimer *timer) { for (const cTimer *t = Timers.First(); t; t = Timers.Next(t)) { #endif if (t == timer) - return DisplayTimerConflict(timerID); - timerID++; + return DisplayTimerConflict(timer->Id() - 1); } return false; } @@ -229,10 +227,10 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) { if (cRecMenuTimerConflict *menu = dynamic_cast<cRecMenuTimerConflict*>(activeMenu)) { timerIndex = menu->GetTimerConflictIndex(); } else break; - int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex); + int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex) + 1; #if VDRVERSNUM >= 20301 LOCK_TIMERS_READ; - const cTimer *t = Timers->Get(timerID); + const cTimer *t = Timers->GetById(timerID); #else const cTimer *t = Timers.Get(timerID); #endif @@ -250,7 +248,7 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) { if (cRecMenuTimerConflict *menu = dynamic_cast<cRecMenuTimerConflict*>(activeMenu)) { timerIndex = menu->GetTimerConflictIndex(); } else break; - int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex); + int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex) + 1; const cTimers* timers; #if VDRVERSNUM >= 20301 { @@ -260,10 +258,11 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) { #else timers = &Timers; #endif - recManager->DeleteTimer(timers->Get(timerID)->Event()); + const cEvent *event = timers->GetById(timerID)->Event(); + recManager->DeleteTimer(event); // (timerID); delete activeMenu; if (!DisplayTimerConflict(timerID)) { - activeMenu = new cRecMenuConfirmTimer(timers->Get(timerID)->Event()); + activeMenu = new cRecMenuConfirmDeleteTimer(event); activeMenu->Display(); } break; } @@ -274,10 +273,10 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) { if (cRecMenuTimerConflict *menu = dynamic_cast<cRecMenuTimerConflict*>(activeMenu)) { timerIndex = menu->GetTimerConflictIndex(); } else break; - int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex); + int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex) + 1; #if VDRVERSNUM >= 20301 LOCK_TIMERS_READ; - const cTimer *timer = Timers->Get(timerID); + const cTimer *timer = Timers->GetById(timerID); #else const cTimer *timer = Timers.Get(timerID); #endif @@ -660,10 +659,10 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) { if (cRecMenuTimerConflict *menu = dynamic_cast<cRecMenuTimerConflict*>(activeMenu)) { timerConflict = menu->GetTimerConflictIndex(); } else break; - int timerID = timerConflicts->GetCurrentConflictTimerID(timerConflict); + int timerID = timerConflicts->GetCurrentConflictTimerID(timerConflict) + 1; #if VDRVERSNUM >= 20301 LOCK_TIMERS_READ; - const cTimer *timer = Timers->Get(timerID); + const cTimer *timer = Timers->GetById(timerID); #else cTimer *timer = Timers.Get(timerID); #endif |