Dropped backwards compatibility for VDR 1.6.0 (Closes #944)

4 files changed, 7 insertions, 25 deletions

diff --git a/HISTORY b/HISTORY
index 6a19bb7..4c56b8d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,10 +1,11 @@
 VDR Plugin 'osdteletext' Revision History
 -----------------------------------------
 
-2013-xx-xx: version x.x.x
+2013-xx-xx: version 1.0.0
 - Allow to override the CXXFLAGS
 - Fixed CZ font and added CZ-SK subset - patch provided Marek Hajduk
   (Closes #1134)
+- Dropped backwards compatibility for VDR 1.6.0 (Closes #944)
 
 2012-04-03: version 0.9.3
 - VDR 1.7.27 compatibility (Closes #919), Credit goes to nox and gda fro
diff --git a/osdteletext.c b/osdteletext.c
index c6cd090..04e0b49 100644
--- a/osdteletext.c
+++ b/osdteletext.c
@@ -21,11 +21,11 @@ using namespace std;
 #include "txtrecv.h"
 #include "setup.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10600
-#error "VDR-1.6.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10739
+#error "VDR-1.7.39 API version or greater is required!"
 #endif
 
-static const char *VERSION        = "0.9.3";
+static const char *VERSION        = "1.0.0";
 static const char *DESCRIPTION    = trNOOP("Displays teletext on the OSD");
 static const char *MAINMENUENTRY  = trNOOP("Teletext");
 
diff --git a/txtrecv.c b/txtrecv.c
index 3c47ced..9aa8984 100644
--- a/txtrecv.c
+++ b/txtrecv.c
@@ -483,21 +483,12 @@ cTxtStatus::~cTxtStatus()
     delete receiver;
 }
 
-void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber
-#if APIVERSNUM >= 10726
-                               , bool LiveView
-#endif
-                               )
+void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
 {
-#if APIVERSNUM < 10726
-   bool LiveView = Device->IsPrimaryDevice();
-#endif
-#if APIVERSNUM >= 10725
    // Disconnect receiver if channel is 0, will reconnect to new
    // receiver after channel change.
    if (LiveView && ChannelNumber == 0)
       DELETENULL(receiver);
-#endif
 
    // ignore if channel is 0
    if (ChannelNumber == 0) return;
@@ -527,17 +518,11 @@ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber
 
 
 cTxtReceiver::cTxtReceiver(const cChannel* chan, bool storeTopText, Storage* storage)
-#if APIVERSNUM >= 10712
  : cReceiver(chan, -1), cThread("osdteletext-receiver"),
-#else
- : cReceiver(chan, -1, chan->Tpid()), cThread("osdteletext-receiver"),
-#endif
    TxtPage(0), storeTopText(storeTopText), buffer((188+60)*75), storage(storage)
 {
-#if APIVERSNUM >= 10712
    SetPids(NULL);
    AddPid(chan->Tpid());
-#endif
    storage->prepareDirectory(ChannelID());
 
    // 10 ms timeout on getting TS frames
diff --git a/txtrecv.h b/txtrecv.h
index 3468b6e..2558bb5 100644
--- a/txtrecv.h
+++ b/txtrecv.h
@@ -176,11 +176,7 @@ private:
    bool storeTopText;
    Storage* storage;
 protected:
-   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber
-#if APIVERSNUM >= 10726
-                              , bool LiveView
-#endif
-                              );
+   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
 public:
    cTxtStatus(bool storeTopText, Storage* storage);
    ~cTxtStatus();