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 /channelcolumn.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 'channelcolumn.c')
| -rw-r--r-- | channelcolumn.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/channelcolumn.c b/channelcolumn.c index 666b6b5..6a65428 100644 --- a/channelcolumn.c +++ b/channelcolumn.c @@ -5,12 +5,12 @@ cChannelColumn::cChannelColumn(int num, const cChannel *channel, cMyTime *myTime this->channel = channel; this->num = num; this->myTime = myTime; -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 #else hasTimer = channel->HasTimer(); #endif hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel); -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 #else schedulesLock = new cSchedulesLock(false, 100); #endif @@ -21,7 +21,7 @@ cChannelColumn::~cChannelColumn(void) { if (header) delete header; grids.Clear(); -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 #else delete schedulesLock; #endif @@ -42,7 +42,7 @@ void cChannelColumn::drawHeader() { } bool cChannelColumn::readGrids() { -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 LOCK_SCHEDULES_READ; const cSchedules* schedules = Schedules; #else @@ -200,7 +200,7 @@ void cChannelColumn::AddNewGridsAtStart() { return; } //if not, i have to add new ones to the list -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 LOCK_SCHEDULES_READ; const cSchedules* schedules = Schedules; #else @@ -253,7 +253,7 @@ void cChannelColumn::AddNewGridsAtEnd() { return; } //if not, i have to add new ones to the list -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 LOCK_SCHEDULES_READ; const cSchedules* schedules = Schedules; #else @@ -366,7 +366,7 @@ cGrid *cChannelColumn::addDummyGrid(time_t start, time_t end, cGrid *firstGrid, } void cChannelColumn::SetTimers() { -#if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +#if VDRVERSNUM >= 20301 #else hasTimer = channel->HasTimer(); #endif |