From 67b6c9f4f71b2b56a4a67852662a4a4f3788c398 Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Fri, 18 Sep 2015 18:41:56 +0300
Subject: [PATCH] Removed support for older version than vdr-2.3.1.

---
 HISTORY     |  9 +++++++++
 device.c    | 10 ----------
 po/ca_ES.po |  2 +-
 po/de_DE.po |  2 +-
 po/es_ES.po |  2 +-
 po/fi_FI.po |  2 +-
 satip.c     |  6 +++---
 7 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/HISTORY b/HISTORY
index c2af5dd..bf9fb61 100644
--- a/HISTORY
+++ b/HISTORY
@@ -144,3 +144,12 @@ VDR Plugin 'satip' Revision History
 - Reset the RTSP connection after any failed connect.
 - Added tweaks for minisatip and Schwaiger MS41IP.
 - Updated for vdr-2.3.1 (Thanks to Klaus Schmidinger).
+
+
+===================================
+VDR Plugin 'satip' Revision History
+===================================
+
+2015-XX-XX: Version 2.3.0
+
+- ...
diff --git a/device.c b/device.c
index ad96434..471506d 100644
--- a/device.c
+++ b/device.c
@@ -103,12 +103,8 @@ cString cSatipDevice::GetSatipStatus(void)
          bool live = (device == cDevice::ActualDevice());
          bool lock = device->HasLock();
          const cChannel *channel = device->GetCurrentlyTunedTransponder();
-#if defined(APIVERSNUM) && APIVERSNUM >= 20301
          LOCK_TIMERS_READ;
          for (const cTimer *timer = Timers->First(); timer; timer = Timers->Next(timer)) {
-#else
-         for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
-#endif
              if (timer->Recording()) {
                 cRecordControl *control = cRecordControls::GetRecordControl(timer);
                 if (control && control->Device() == device)
@@ -133,20 +129,14 @@ cString cSatipDevice::GetSatipStatus(void)
 cString cSatipDevice::GetGeneralInformation(void)
 {
   debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
-#if defined(APIVERSNUM) && APIVERSNUM >= 20301
   LOCK_CHANNELS_READ;
-#endif
   return cString::sprintf("SAT>IP device: %d\nCardIndex: %d\nStream: %s\nSignal: %s\nStream bitrate: %s\n%sChannel: %s",
                           deviceIndexM, CardIndex(),
                           pTunerM ? *pTunerM->GetInformation() : "",
                           pTunerM ? *pTunerM->GetSignalStatus() : "",
                           pTunerM ? *pTunerM->GetTunerStatistic() : "",
                           *GetBufferStatistic(),
-#if defined(APIVERSNUM) && APIVERSNUM >= 20301
                           *Channels->GetByNumber(cDevice::CurrentChannel())->ToText());
-#else
-                          *Channels.GetByNumber(cDevice::CurrentChannel())->ToText());
-#endif
 }
 
 cString cSatipDevice::GetPidsInformation(void)
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 653f8fe..1eac371 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.3\n"
+"Project-Id-Version: vdr-satip 2.3.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-04-26 04:26+0300\n"
 "PO-Revision-Date: 2015-04-26 04:26+0300\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index b1794cd..1a0c4a7 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.3\n"
+"Project-Id-Version: vdr-satip 2.3.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-04-26 04:26+0300\n"
 "PO-Revision-Date: 2015-04-26 04:26+0300\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index dbc27d3..5200c21 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.3\n"
+"Project-Id-Version: vdr-satip 2.3.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-04-26 04:26+0300\n"
 "PO-Revision-Date: 2015-04-26 04:26+0300\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index fbad1b1..5cd9d72 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.3\n"
+"Project-Id-Version: vdr-satip 2.3.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-04-26 04:26+0300\n"
 "PO-Revision-Date: 2015-04-26 04:26+0300\n"
diff --git a/satip.c b/satip.c
index 3453c48..9373eff 100644
--- a/satip.c
+++ b/satip.c
@@ -19,15 +19,15 @@
 #warning "CURL version >= 7.36.0 is recommended"
 #endif
 
-#if defined(APIVERSNUM) && APIVERSNUM < 20200
-#error "VDR-2.2.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20301
+#error "VDR-2.3.1 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "2.2.3" GITVERSION;
+       const char VERSION[]     = "2.3.0" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("SAT>IP Devices");
 
 class cPluginSatip : public cPlugin {