From bf2937d86c316edb716c6fe1bdb97e7c706f675c Mon Sep 17 00:00:00 2001
From: kamel5 <kamel5 (at) gmx (dot) net>
Date: Thu, 8 Mar 2018 13:30:41 +0100
Subject: Cosmetic changes / SwitchTimer& operator / std:min,std:max

---
 recmenumanager.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'recmenumanager.c')

diff --git a/recmenumanager.c b/recmenumanager.c
index cb4bf12..4844373 100644
--- a/recmenumanager.c
+++ b/recmenumanager.c
@@ -125,7 +125,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 timerIndex = menu->GetTimerConflictIndex();
             } else break;
             int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex);
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             LOCK_TIMERS_READ;
             const cTimer *t = Timers->Get(timerID);
 #else
@@ -161,7 +161,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 timerIndex = menu->GetTimerConflictIndex();
             } else break;
             int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex);
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             LOCK_TIMERS_READ;
             const cTimer *timer = Timers->Get(timerID);
 #else
@@ -177,7 +177,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             //caller: cRecMenuEditTimer
             //save timer from current timer conflict
             cTimer timerModified;
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             const cTimer *originalTimer;
 #else
             cTimer *originalTimer;
@@ -214,7 +214,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             break;
         case rmsEditTimer: {
             //edit timer for active event
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             LOCK_TIMERS_READ;
             const cTimer *timer = recManager->GetTimerForEvent(event);
 #else
@@ -230,7 +230,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             //caller: cRecMenuEditTimer
             //save timer for active event
             cTimer timerModified;
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             const cTimer *originalTimer;
 #else
             cTimer *originalTimer;
@@ -253,7 +253,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 recFolder = menu->GetFolder();
             }
             delete activeMenu;
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             LOCK_CHANNELS_READ;
             const cChannel *channel = Channels->GetByChannelID(event->ChannelID());
 #else
@@ -500,7 +500,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 activeMenu = new cRecMenuRecordingSearch(searchString);
             } else {
                 int numSearchResults = 0;
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
                 const cRecording **searchResult = recManager->SearchForRecordings(searchString, numSearchResults);
 #else
                 cRecording **searchResult = recManager->SearchForRecordings(searchString, numSearchResults);
@@ -638,7 +638,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 timerConflict = menu->GetTimerConflictIndex();
             } else break;
             int timerID = timerConflicts->GetCurrentConflictTimerID(timerConflict);
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             LOCK_TIMERS_READ;
             const cTimer *timer = Timers->Get(timerID);
 #else
@@ -685,7 +685,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 originalConflictIndex = menu->GetTimerConflictIndex();
             } else break;
             int originalTimerID = timerConflicts->GetCurrentConflictTimerID(originalConflictIndex);
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             LOCK_TIMERS_READ;
             const cTimer *timerOriginal = Timers->Get(originalTimerID);
 #else
@@ -716,7 +716,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenu->Display();
             break; } 
         case rmsTimelineTimerEdit: {
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             const cTimer *timer;
 #else
             cTimer *timer;
@@ -732,7 +732,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             break;}
         case rmsTimelineTimerSave: {
             cTimer timerModified;
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             const cTimer *originalTimer;
 #else
             cTimer *originalTimer;
@@ -751,7 +751,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenu->Display();
             break; }
         case rmsTimelineTimerDelete: {
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
             const cTimer *timer;
 #else
             cTimer *timer;
@@ -872,7 +872,7 @@ void cRecMenuManager::DisplaySearchTimerList(void) {
     activeMenu->Display();
 }
 
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+#if VDRVERSNUM >= 20301
 bool cRecMenuManager::DisplayTimerConflict(const cTimer *timer) {
     int timerID = 0;
     LOCK_TIMERS_READ;
-- 
cgit v1.2.3