Commit 0003-Use-HandleRemoteTimerModifications-instead-of-Handle.diff (thx jasminj@vdr-portal.de)

6 files changed, 7 insertions, 26 deletions

diff --git a/menu_commands.c b/menu_commands.c
index f3194e9..3c7bfe6 100644
--- a/menu_commands.c
+++ b/menu_commands.c
@@ -40,10 +40,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include <vdr/menu.h>
 #include "menu_deftimercheckmethod.h"
 
-#if VDRVERSNUM > 20300
-extern bool HandleRemoteModifications(cTimer* NewTimer, cTimer* OldTimer);
-#endif
-
 // --- cMenuSearchCommands ---------------------------------------------------------
 
 cMenuSearchCommands::cMenuSearchCommands(const char *Title, const cEvent* Event, bool DirectCall, cSearchExt* Search)
@@ -195,7 +191,7 @@ eOSState cMenuSearchCommands::Record(void)
       timer->Matches();
       vdrtimers->SetModified();
 #if VDRVERSNUM > 20300
-      if (!HandleRemoteModifications(timer,NULL)) {
+      if (!HandleRemoteTimerModifications(timer)) {
          vdrtimers->Del(timer);
          delete timer;
       }
diff --git a/menu_main.c b/menu_main.c
index c528918..e776599 100644
--- a/menu_main.c
+++ b/menu_main.c
@@ -42,9 +42,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 int toggleKeys=0;
 int exitToMainMenu = 0;
 extern int gl_InfoConflict;
-#if VDRVERSNUM > 20300
-extern bool HandleRemoteModifications(cTimer* NewTimer, cTimer* OldTimer);
-#endif
 
 int cMenuSearchMain::forceMenu = 0; // 1 = now, 2 = schedule, 3 = summary
 
@@ -274,7 +271,7 @@ eOSState cMenuSearchMain::Record(void)
 #if VDRVERSNUM < 20300
 	 vdrtimers->SetModified();
 #else
-         if (!HandleRemoteModifications(timer,NULL)) {
+         if (!HandleRemoteTimerModifications(timer)) {
             vdrtimers->Del(timer);
             delete timer;
          }
diff --git a/menu_myedittimer.c b/menu_myedittimer.c
index 563b3b4..c578f5b 100644
--- a/menu_myedittimer.c
+++ b/menu_myedittimer.c
@@ -36,9 +36,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include <math.h>
 
 const char *cMenuMyEditTimer::CheckModes[3];
-#if VDRVERSNUM > 20300
-extern bool HandleRemoteModifications(cTimer* NewTimer, cTimer* OldTimer);
-#endif
 
 cMenuMyEditTimer::cMenuMyEditTimer(cTimer *Timer, bool New, const cEvent* Event, const cChannel* forcechannel)
 :cOsdMenu(trVDR("Edit timer"), 14)
@@ -464,7 +461,7 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key)
                       vdrtimers->Add(timer);
 #if VDRVERSNUM > 20300
                       vdrtimers->SetModified();
-                      if (!HandleRemoteModifications(timer,NULL)) {
+                      if (!HandleRemoteTimerModifications(timer)) {
                          vdrtimers->Del(timer);
                          delete timer;
                       }
diff --git a/menu_searchresults.c b/menu_searchresults.c
index 6635d43..82cbe03 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -44,9 +44,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 const char* ButtonBlue[3] = {NULL, NULL, NULL};
 extern int gl_InfoConflict;
 extern bool isUTF8;
-#if VDRVERSNUM > 20300
-extern bool HandleRemoteModifications(cTimer* NewTimer, cTimer* OldTimer);
-#endif
 
 static int CompareRecording(const void *p1, const void *p2)
 {
@@ -329,7 +326,7 @@ eOSState cMenuSearchResults::Record(void)
          timer->Matches();
          vdrtimers->SetModified();
 #if VDRVERSNUM > 20300
-         if (!HandleRemoteModifications(timer,NULL)) {
+         if (!HandleRemoteTimerModifications(timer)) {
             vdrtimers->Del(timer);
             delete timer;
          }
diff --git a/menu_whatson.c b/menu_whatson.c
index 862084d..b99a0db 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -52,9 +52,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 
 extern int exitToMainMenu;
 extern bool isUTF8;
-#if VDRVERSNUM > 20300
-extern bool HandleRemoteModifications(cTimer* NewTimer, cTimer* OldTimer);
-#endif
 int gl_InfoConflict = 0;
 
 // --- cMenuMyScheduleItem ------------------------------------------------------
@@ -672,7 +669,7 @@ eOSState cMenuWhatsOnSearch::Record(void)
          timer->Matches();
          vdrtimers->SetModified();
 #if VDRVERSNUM > 20300
-         if (!HandleRemoteModifications(timer,NULL)) {
+         if (!HandleRemoteTimerModifications(timer)) {
             vdrtimers->Del(timer);
             delete timer;
          }
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index 2e17d8d..9ee5957 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -52,9 +52,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #define DAYBUFFERSIZE 32
 
 extern int updateForced;
-#if VDRVERSNUM > 20300
-extern bool HandleRemoteModifications(cTimer* NewTimer, cTimer* OldTimer);
-#endif
 
 cSearchTimerThread *cSearchTimerThread::m_Instance = NULL;
 cSearchResults cSearchTimerThread::announceList;
@@ -784,9 +781,9 @@ bool cSearchTimerThread::AddModTimer(cTimer* Timer, int index, cSearchExt* searc
    LogFile.Log(1, "AddModTimer SVDRP done"); //JF
 #if VDRVERSNUM > 20300
    }
-   if (!HandleRemoteModifications(Timer,NULL))
+   if (!HandleRemoteTimerModifications(Timer))
      return false;
-   LogFile.Log(1, "AddModTimer HandleRemoteModifications done"); //JF
+   LogFile.Log(1, "AddModTimer HandleRemoteTimerModifications done"); //JF
 #endif
 
    if (gl_timerStatusMonitor) gl_timerStatusMonitor->SetConflictCheckAdvised();