compile fix for vdr>=2.1.2

thanks to hd_brummy reporting bug #1858 and sending the patch

http://projects.vdr-developer.org/issues/1858

2 files changed, 28 insertions, 0 deletions

diff --git a/menuundelete.c b/menuundelete.c
index aab0a71..ac259ca 100644
--- a/menuundelete.c
+++ b/menuundelete.c
@@ -94,7 +94,11 @@ char *cMenuRecordingSelectItem::DirName(bool Parent)
   if (isdir || Parent)
   {
     temp = strdup(filename);
+#if VDRVERSNUM >= 20102
+    char *last = temp + strlen(cVideoDirectory::Name()) + 1;
+#else
     char *last = temp + strlen(VideoDirectory) + 1;
+#endif
     for (int i = level; *last && i >= Parent ? -1 : 0; i--)
     {
       last = strchr(last, '/');
@@ -597,7 +601,11 @@ eOSState cMenuUndelete::ProcessKey(eKeys Key)
                             {
                               if (verbose.u)
                                 isyslog("%s: purge deleted recording (%s)", plugin_name, recording->FileName());
+#if VDRVERSNUM >= 20102
+                              if (!cVideoDirectory::RemoveVideoFile(recording->FileName()))
+#else
                               if (!RemoveVideoFile(recording->FileName()))
+#endif
                               {
                                 esyslog("%s: Error while remove deleted recording (%s)", plugin_name, recording->FileName());
                                 processerror = true;
@@ -631,7 +639,11 @@ eOSState cMenuUndelete::ProcessKey(eKeys Key)
                                   processerror = true;
                                 } else
                                 {
+#if VDRVERSNUM >= 20102
+                                  if (!cVideoDirectory::RenameVideoFile(recording->FileName(), NewName))
+#else
                                   if (!RenameVideoFile(recording->FileName(), NewName))
+#endif
                                   {
                                     esyslog("%s: Error while rename deleted recording (%s) to (%s)", plugin_name, recording->FileName(), NewName);
                                     processerror = true;
diff --git a/undelete.c b/undelete.c
index 227c6c0..79f4e81 100644
--- a/undelete.c
+++ b/undelete.c
@@ -824,7 +824,11 @@ cString cPluginUndelete::SVDRPCommand(const char *Command, const char *Option, i
           {
             if (verbose.u)
               isyslog("%s: purge deleted recording (%s)", plugin_name, recording->FileName());
+#if VDRVERSNUM >= 20102
+            if (!cVideoDirectory::RemoveVideoFile(recording->FileName()))
+#else
             if (!RemoveVideoFile(recording->FileName()))
+#endif
             {
               esyslog("%s: Error while removing deleted recording (%s)", plugin_name, recording->FileName());
               return cString::sprintf("error while purging the deleted recording \"%s\"  [%s]", Option, recording->Title());
@@ -928,7 +932,11 @@ cString cPluginUndelete::SVDRPCommand(const char *Command, const char *Option, i
                 return cString::sprintf("recording with the same name exists \"%s\" [%s]", Option, recording->Title());
               } else
               {
+#if VDRVERSNUM >= 20102
+                if (!cVideoDirectory::RenameVideoFile(recording->FileName(), (const char *)NewName))
+#else
                 if (!RenameVideoFile(recording->FileName(), (const char *)NewName))
+#endif
                 {
                   esyslog("%s: Error while renaming deleted recording (%s) to (%s)", plugin_name, recording->FileName(), (const char *)NewName);
                   return cString::sprintf("error while renaming deleted recording \"%s\" [%s]", Option, recording->Title());
@@ -1035,11 +1043,19 @@ cString cPluginUndelete::SVDRPCommand(const char *Command, const char *Option, i
 #endif
 
 void cRemoveThread::Action(void)
+#if VDRVERSNUM >= 20102
+{
+  d1syslogi("cRemoveThread::Action", "cVideoDirectory::RemoveEmptyVideoDirectories thread started (pid=%d)", getpid());
+  cVideoDirectory::RemoveEmptyVideoDirectories();
+  d1syslogi("cRemoveThread::Action", "cVideoDirectory::RemoveEmptyVideoDirectories thread ended (pid=%d)", getpid());
+}
+#else
 {
   d1syslogi("cRemoveThread::Action", "RemoveEmptyVideoDirectories thread started (pid=%d)", getpid());
   RemoveEmptyVideoDirectories();
   d1syslogi("cRemoveThread::Action", "RemoveEmptyVideoDirectories thread ended (pid=%d)", getpid());
 }
+#endif
 
 bool cRemoveThread::ActiveWithCancel(void)
 {