summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--Makefile5
-rw-r--r--undelete.c4
-rw-r--r--vdrtools.c2
-rw-r--r--vdrtools.h2
5 files changed, 2 insertions, 13 deletions
diff --git a/HISTORY b/HISTORY
index 5dafbda..3d417d9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10,6 +10,8 @@ VDR Plugin 'undelete' Revision History
- insert compile fix for vdr >=2.1.2, thx to hd_brummy
closes ticket #1858 http://projects.vdr-developer.org/issues/1858
- new Makefile taken from vdr-2.1.6
+- remove conditional code for HAVE_SVDRP since SVDRP is always included
+ at least since vdr-1.5.7
2012-10-05 Version: 0.0.7
-------------------------
diff --git a/Makefile b/Makefile
index c872830..d39d2d3 100644
--- a/Makefile
+++ b/Makefile
@@ -52,11 +52,6 @@ INCLUDES +=
DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-### Test SVDRP
-ifeq ($(shell grep -q ReplyCode $(VDRDIR)/plugin.h ; echo $$?),0)
- DEFINES += -DHAVE_SVDRP
-endif
-
### Test Elchi
ifeq ($(shell test -f $(VDRDIR)/theme.h ; echo $$?),0)
DEFINES += -DHAVE_ELCHI
diff --git a/undelete.c b/undelete.c
index 3be57b1..097c419 100644
--- a/undelete.c
+++ b/undelete.c
@@ -225,10 +225,8 @@ public:
virtual cMenuSetupPage *SetupMenu(void) { TestAndSetOSDLanguage(); return new cMenuSetupUndelete; }
virtual bool SetupParse(const char *Name, const char *Value);
-#ifdef HAVE_SVDRP
virtual const char **SVDRPHelpPages(void);
virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
-#endif
};
cPluginUndelete::cPluginUndelete(void)
@@ -661,7 +659,6 @@ bool cPluginUndelete::SetupParse(const char *Name, const char *Value)
#undef SetParamChar
}
-#ifdef HAVE_SVDRP
const char **cPluginUndelete::SVDRPHelpPages(void)
{
static const char *HelpPages[] = {
@@ -1040,7 +1037,6 @@ cString cPluginUndelete::SVDRPCommand(const char *Command, const char *Option, i
return NULL;
#undef CMD
}
-#endif
void cRemoveThread::Action(void)
#if VDRVERSNUM >= 20102
diff --git a/vdrtools.c b/vdrtools.c
index d9837b1..648572b 100644
--- a/vdrtools.c
+++ b/vdrtools.c
@@ -11,7 +11,6 @@
#include <vdr/menu.h>
#include <vdr/interface.h>
-#ifdef HAVE_SVDRP
bool GetVDRSize(const char *dir, long long &llSize)
{
bool bRet = false;
@@ -33,7 +32,6 @@ bool GetVDRSize(const char *dir, long long &llSize)
}
return bRet;
}
-#endif
char *SkipQuote(char *s)
{
diff --git a/vdrtools.h b/vdrtools.h
index c6780c1..d94cffd 100644
--- a/vdrtools.h
+++ b/vdrtools.h
@@ -13,9 +13,7 @@
#include <vdr/osd.h>
#include <vdr/osdbase.h>
-#ifdef HAVE_SVDRP
bool GetVDRSize(const char *dir, long long &llSize);
-#endif
char *SkipQuote(char *s);
char *ExchangeChars(char *s, bool ToFileSystem);