diff options
Diffstat (limited to 'menu_myedittimer.c')
| -rw-r--r-- | menu_myedittimer.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/menu_myedittimer.c b/menu_myedittimer.c index 359f12f..c3bd0e1 100644 --- a/menu_myedittimer.c +++ b/menu_myedittimer.c @@ -74,9 +74,6 @@ cMenuMyEditTimer::cMenuMyEditTimer(cTimer *Timer, bool New, const cEvent* Event, Set(); SetHelp(addIfConfirmed?NULL:trVDR("Button$Delete"), NULL, NULL, NULL); } -#if VDRVERSNUM < 20300 - Timers.IncBeingEdited(); -#endif } void cMenuMyEditTimer::SplitFile() @@ -130,12 +127,8 @@ void cMenuMyEditTimer::Set() #ifdef USE_PINPLUGIN if (cOsd::pinValid || !fskProtection) Add(new cMenuEditChanItem(tr("Channel"), &channel)); else { -#if VDRVERSNUM > 20300 LOCK_CHANNELS_READ; const cChannels *vdrchannels = Channels; -#else - cChannels *vdrchannels = &Channels; -#endif cString buf = cString::sprintf("%s\t%s", tr("Channel"), vdrchannels->GetByNumber(channel)->Name()); Add(new cOsdItem(buf)); } @@ -168,12 +161,8 @@ void cMenuMyEditTimer::Set() } else if (IsSingleEvent() && event) { -#if VDRVERSNUM > 20300 LOCK_CHANNELS_READ; const cChannels *vdrchannels = Channels; -#else - cChannels *vdrchannels = &Channels; -#endif checkmode = DefTimerCheckModes.GetMode(vdrchannels->GetByNumber(channel)); char* checkmodeAux = GetAuxValue(timer, "update"); if (checkmodeAux) @@ -208,9 +197,6 @@ cMenuMyEditTimer::~cMenuMyEditTimer() { if (timer && addIfConfirmed) delete timer; // apparently it wasn't confirmed -#if VDRVERSNUM < 20300 - Timers.DecBeingEdited(); -#endif } void cMenuMyEditTimer::HandleSubtitle() @@ -247,7 +233,6 @@ bool cMenuMyEditTimer::IsSingleEvent(void) const eOSState cMenuMyEditTimer::DeleteTimer() { // Check if this timer is active: -#if VDRVERSNUM > 20300 LOCK_TIMERS_WRITE; if (!Timers) { ERROR(tr("Epgsearch: Recursive LOCK DeleteTimer failed")); @@ -255,19 +240,12 @@ eOSState cMenuMyEditTimer::DeleteTimer() } Timers->SetExplicitModify(); cTimers *vdrtimers = Timers; -#else - cTimers *vdrtimers = &Timers; -#endif if (timer && !addIfConfirmed) { if (Interface->Confirm(trVDR("Delete timer?"))) { if (timer->Recording()) { if (Interface->Confirm(trVDR("Timer still recording - really delete?"))) { timer->Skip(); -#if VDRVERSNUM > 20300 cRecordControls::Process(vdrtimers, time(NULL)); -#else - cRecordControls::Process(time(NULL)); -#endif } else return osContinue; @@ -354,12 +332,8 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) { case kOk: { -#if VDRVERSNUM > 20300 LOCK_CHANNELS_READ; const cChannels *vdrchannels = Channels; -#else - cChannels *vdrchannels = &Channels; -#endif const cChannel *ch = vdrchannels->GetByNumber(channel); if (!ch) { @@ -441,7 +415,6 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) free(tmpFile); free(tmpDir); -#if VDRVERSNUM > 20300 { LOCK_TIMERS_WRITE; if (!Timers) { @@ -452,12 +425,8 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) cTimers* vdrtimers = Timers; if (*Setup.SVDRPDefaultHost) timer->SetRemote(Setup.SVDRPDefaultHost); -#else - cTimers* vdrtimers = &Timers; -#endif if (addIfConfirmed) { vdrtimers->Add(timer); -#if VDRVERSNUM > 20300 vdrtimers->SetModified(); if (!HandleRemoteTimerModifications(timer)) { delete timer; @@ -468,15 +437,8 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) } LOCK_SCHEDULES_READ; timer->SetEventFromSchedule(Schedules); -#else - } - timer->SetEventFromSchedule(); -#endif timer->Matches(); gl_timerStatusMonitor->SetConflictCheckAdvised(); -#if VDRVERSNUM < 20300 - vdrtimers->SetModified(); -#endif addIfConfirmed = false; } else { free(tmpFile); |