diff options
| author | kamel5 <kamel5 (at) gmx (dot) net> | 2018-03-08 13:30:41 +0100 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-01-27 11:30:01 +0100 |
| commit | bf2937d86c316edb716c6fe1bdb97e7c706f675c (patch) | |
| tree | fa8878241e876ee18fe417de51fc26cea1f76f6a /recmenuitem.c | |
| parent | 6ae27238afa33e17dece7311c4728b5c1f2f83b2 (diff) | |
| download | vdr-plugin-tvguide-bf2937d86c316edb716c6fe1bdb97e7c706f675c.tar.gz vdr-plugin-tvguide-bf2937d86c316edb716c6fe1bdb97e7c706f675c.tar.bz2 | |
Cosmetic changes / SwitchTimer& operator / std:min,std:max
Diffstat (limited to 'recmenuitem.c')
| -rw-r--r-- | recmenuitem.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/recmenuitem.c b/recmenuitem.c index c45a317..318c667 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -1817,7 +1817,7 @@ void cRecMenuItemEvent::Draw(void) { if (!event) return; int logoX = DrawIcons(); -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 LOCK_CHANNELS_READ; const cChannel *channel = Channels->GetByChannelID(event->ChannelID()); #else @@ -1918,7 +1918,7 @@ eRecMenuState cRecMenuItemEvent::ProcessKey(eKeys Key) { // --- cRecMenuItemChannelChooser ------------------------------------------------------- cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text, -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 const cChannel *initialChannel, #else cChannel *initialChannel, @@ -2007,7 +2007,7 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) { fresh = true; if (!channel) return rmsConsumed; -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 const cChannel *prev = channel; LOCK_CHANNELS_READ; const cChannel *firstChannel = Channels->First(); @@ -2016,7 +2016,7 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) { cChannel *firstChannel = Channels.First(); #endif if(firstChannel->GroupSep()) -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 firstChannel = Channels->Next(firstChannel); #else firstChannel = Channels.Next(firstChannel); @@ -2025,7 +2025,7 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) { if (!initialChannelSet) channel = NULL; } else { -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 while (prev = Channels->Prev(prev)) { #else while (prev = Channels.Prev(prev)) { @@ -2046,24 +2046,24 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) { return rmsConsumed; break; } case kRight: { -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 LOCK_CHANNELS_READ; #endif fresh = true; if (!channel) { -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 channel = Channels->First(); #else channel = Channels.First(); #endif if(channel->GroupSep()) -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 channel = Channels->Next(channel); #else channel = Channels.Next(channel); #endif } else { -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 const cChannel *next = channel; while (next = Channels->Next(next)) { #else @@ -2091,7 +2091,7 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) { fresh = false; } channelNumber = channelNumber * 10 + (Key - k0); -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 LOCK_CHANNELS_READ; const cChannel *chanNew = Channels->GetByNumber(channelNumber); #else @@ -2258,7 +2258,7 @@ eRecMenuState cRecMenuItemDayChooser::ProcessKey(eKeys Key) { } // --- cRecMenuItemRecording ------------------------------------------------------- -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 cRecMenuItemRecording::cRecMenuItemRecording(const cRecording *recording, bool active) { #else cRecMenuItemRecording::cRecMenuItemRecording(cRecording *recording, bool active) { @@ -2290,7 +2290,7 @@ void cRecMenuItemRecording::Draw(void) { if (!recording) return; const cRecordingInfo *recInfo = recording->Info(); -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 LOCK_CHANNELS_READ; const cChannel *channel = Channels->GetByChannelID(recInfo->ChannelID()); #else @@ -2510,7 +2510,7 @@ void cRecMenuItemTimelineHeader::Show(void) { // --- cRecMenuItemTimelineTimer ------------------------------------------------------- -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 cRecMenuItemTimelineTimer::cRecMenuItemTimelineTimer(const cTimer *timer, time_t start, time_t stop, std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active) { #else cRecMenuItemTimelineTimer::cRecMenuItemTimelineTimer(cTimer *timer, time_t start, time_t stop, std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active) { @@ -2661,7 +2661,7 @@ void cRecMenuItemTimelineTimer::Show(void) { if (pixmapTimerConflicts) pixmapTimerConflicts->SetLayer(6); } -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 const cTimer *cRecMenuItemTimelineTimer::GetTimerValue(void) { #else cTimer *cRecMenuItemTimelineTimer::GetTimerValue(void) { |