Updated HISTORY.

this makes it possible to use the satip through a
NAT (e.g. a docker bridged network)

HISTORY

@@ -156,21 +156,3 @@ VDR Plugin 'satip' Revision History
 - Added multicast and RTP-over-TCP support.
 - Added support for activating/deactivating server on-the-fly.
 - Extended command-line parameters for setting server quirks.
-
-
-===================================
-VDR Plugin 'satip' Revision History
-===================================
-
-2016-12-18: Version 2.3.0
-
-- Updated for vdr-2.3.1.
-- Updated German translation (Thanks to Frank Neumann).
-- Fixed Panasonic CXW804 support (Thanks to Tobias Grimm).
-- Fixed C++11 support (Thanks to Tobias Grimm).
-- Fixed server assigment with source validation (Thanks to Patrick Boettcher).
-- Added configurable RTP/RTCP ports (Thanks to chriszero).
-- Added support for X-SATIP-RTSP-Port header.
-- Added multicast and RTP-over-TCP support.
-- Added support for activating/deactivating server on-the-fly.
-- Extended command-line parameters for setting server quirks.

device.c

@@ -103,8 +103,12 @@ 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,14 +137,20 @@ 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\n",
                           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)

po/ca_ES.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.0\n"
+"Project-Id-Version: vdr-satip 2.2.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2016-12-18 12:18+0200\n"
 "PO-Revision-Date: 2016-12-18 12:18+0200\n"

po/de_DE.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.0\n"
+"Project-Id-Version: vdr-satip 2.2.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2016-12-18 12:18+0200\n"
 "PO-Revision-Date: 2016-12-18 12:18+0200\n"

po/es_ES.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.0\n"
+"Project-Id-Version: vdr-satip 2.2.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2016-12-18 12:18+0200\n"
 "PO-Revision-Date: 2016-12-18 12:18+0200\n"

po/fi_FI.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.0\n"
+"Project-Id-Version: vdr-satip 2.2.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2016-12-18 12:18+0200\n"
 "PO-Revision-Date: 2016-12-18 12:18+0200\n"

satip.c

@@ -19,15 +19,15 @@
 #warning "CURL version >= 7.36.0 is recommended"
 #endif
 
-#if defined(APIVERSNUM) && APIVERSNUM < 20301
+#if defined(APIVERSNUM) && APIVERSNUM < 20200
-#error "VDR-2.3.1 API version or greater is required!"
+#error "VDR-2.2.0 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "2.3.0" GITVERSION;
+       const char VERSION[]     = "2.2.4" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("SAT>IP Devices");
 
 class cPluginSatip : public cPlugin {