cleanup: remove menutext.[ch]

menutext.c and menutext.h were needed for vdr <1.3.8

5 files changed, 6 insertions, 66 deletions

diff --git a/HISTORY b/HISTORY
index e7cc5dc..d932153 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 VDR Plugin 'undelete' Revision History
 --------------------------------------
 
+2012-10-08 Version: UNRELEASED
+-------------------------
+- edit plugin version string to reflect GIT commit IDs
+- new minimum vdr version 1.5.7, added code to ensure this
+- start code cleanup: remove conditional code for vdr <1.5.7
+
 2012-10-05 Version: 0.0.7
 -------------------------
 - fix more typos
diff --git a/Makefile b/Makefile
index 2cb0070..0a72b1b 100644
--- a/Makefile
+++ b/Makefile
@@ -74,10 +74,6 @@ endif
 ### The object files (add further files here):
 
 OBJS = $(PLUGIN).o menuundelete.o menusetup.o vdrtools.o menueditkeys.o menudispkey.o
-#FIXME
-ifeq ($(shell test $(VDRVERSNUM) -lt 10308 ; echo $$?),0)
-  OBJS += menutext.o
-endif
 
 ifneq ($(strip $(GITTAG)),)
 DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'
diff --git a/menutext.c b/menutext.c
deleted file mode 100644
index 83e5a20..0000000
--- a/menutext.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * undelete: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: menutext.c 0.4 2005/11/16 18:39:18 hflor Exp $
- */
-
-#include "menutext.h"
-#include <vdr/menuitems.h>
-
-// --- cMenuText -------------------------------------------------------------
-
-cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
-:cOsdMenu(Title)
-{
-  Add(new cMenuTextItem(Text, 1, 2, Setup.OSDwidth - 2, MAXOSDITEMS, clrWhite, clrBackground, Font));
-}
-
-eOSState cMenuText::ProcessKey(eKeys Key)
-{
-  eOSState state = cOsdMenu::ProcessKey(Key);
-
-  switch (state)
-  {
-    case osUnknown:  switch (NORMALKEY(Key))
-                     {
-                       case kOk:     state = osBack;
-                                     break;
-                       default: break;
-                     }
-                     break;
-    default:         break;
-  }
-  return state;
-}
diff --git a/menutext.h b/menutext.h
deleted file mode 100644
index 1f163fe..0000000
--- a/menutext.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * undelete: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: menutext.h 0.4 2005/11/16 18:39:18 hflor Exp $
- */
-
-#ifndef __MENUTEXT_H
-#define __MENUTEXT_H
-
-#include <vdr/osd.h>
-#include <vdr/osdbase.h>
-
-// --- cMenuText -------------------------------------------------------------
-
-class cMenuText : public cOsdMenu {
-public:
-  cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-#endif // __MENUTEXT_H
diff --git a/menuundelete.c b/menuundelete.c
index e457703..2ca4f39 100644
--- a/menuundelete.c
+++ b/menuundelete.c
@@ -7,9 +7,6 @@
  */
 
 #include "menuundelete.h"
-#if VDRVERSNUM < 10307
-  #include "menutext.h"
-#endif
 #include "undelete.h"
 #include "menudispkey.h"
 #include "vdrtools.h"