diff options
| author | Frank Neumann <fnu@yavdr.org> | 2017-05-12 15:18:58 +0200 |
|---|---|---|
| committer | Frank Neumann <fnu@yavdr.org> | 2017-05-12 15:18:58 +0200 |
| commit | 1b9fb08a555d89a3b9ec9739f2b17563afb43572 (patch) | |
| tree | d01be17d0bd17336f74c92fdef94212ed33a6121 /mail.c | |
| parent | 8ede45905dde9f4109f3d4f0d2e8cedc7beee01c (diff) | |
| download | vdr-plugin-epgsearch-1b9fb08a555d89a3b9ec9739f2b17563afb43572.tar.gz vdr-plugin-epgsearch-1b9fb08a555d89a3b9ec9739f2b17563afb43572.tar.bz2 | |
0002-removed-variableduplications.diff (thx TomJoad@vdr-portal.de)
Diffstat (limited to 'mail.c')
| -rw-r--r-- | mail.c | 18 |
1 files changed, 7 insertions, 11 deletions
@@ -51,8 +51,7 @@ string cMailTimerNotification::Format(const string& templ) const eTimerMatch TimerMatch = tmNone; LOCK_TIMERS_READ; - const cTimers *vdrtimers = Timers; - const cTimer* pTimer = vdrtimers->GetMatch(pEvent, &TimerMatch); + const cTimer* pTimer = Timers->GetMatch(pEvent, &TimerMatch); if (!pTimer) return ""; string result = templ; @@ -73,9 +72,8 @@ string cMailTimerNotification::Format(const string& templ) const const cEvent* cMailTimerNotification::GetEvent() const { LOCK_SCHEDULES_READ; - const cSchedules *schedules = Schedules; - if (!schedules) return NULL; - const cSchedule *schedule = schedules->GetSchedule(channelID); + if (!Schedules) return NULL; + const cSchedule *schedule = Schedules->GetSchedule(channelID); if (!schedule) return NULL; return schedule->GetEvent(eventID); } @@ -83,9 +81,8 @@ const cEvent* cMailTimerNotification::GetEvent() const bool cMailTimerNotification::operator< (const cMailTimerNotification &N) const { LOCK_CHANNELS_READ; - const cChannels *vdrchannels = Channels; - const cChannel* channel = vdrchannels->GetByChannelID(channelID,true,true); - const cChannel* channelOther = vdrchannels->GetByChannelID(N.channelID,true,true); + const cChannel* channel = Channels->GetByChannelID(channelID,true,true); + const cChannel* channelOther = Channels->GetByChannelID(N.channelID,true,true); if (!channel || !channelOther) return false; const cEvent* event = GetEvent(); @@ -126,9 +123,8 @@ cMailDelTimerNotification::cMailDelTimerNotification(const string& Formatted, tC bool cMailDelTimerNotification::operator< (const cMailDelTimerNotification &N) const { LOCK_CHANNELS_READ; - const cChannels *vdrchannels = Channels; - const cChannel* channel = vdrchannels->GetByChannelID(channelID,true,true); - const cChannel* channelOther = vdrchannels->GetByChannelID(N.channelID,true,true); + const cChannel* channel = Channels->GetByChannelID(channelID,true,true); + const cChannel* channelOther = Channels->GetByChannelID(N.channelID,true,true); if (!channel || !channelOther) return false; if (channel != channelOther) |