[vdr-plugin-satip] 01/05: New upstream version 2.3.0

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-satip.

commit 86d5e0835b18bd7c40e7585e9c3a07035e1237cd
Author: Tobias Grimm <etobi at debian.org>
Date:   Sun Jun 25 18:48:48 2017 +0200

    New upstream version 2.3.0
---
 HISTORY     | 18 ++++++++++++++++++
 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, 25 insertions(+), 17 deletions(-)

diff --git a/HISTORY b/HISTORY
index 0166834..bb4cc04 100644
--- a/HISTORY
+++ b/HISTORY
@@ -156,3 +156,21 @@ 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.
diff --git a/device.c b/device.c
index ee8c1c5..941c2f2 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)
@@ -137,20 +133,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\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)
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 5627c62..4f282ad 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.4\n"
+"Project-Id-Version: vdr-satip 2.3.0\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"
diff --git a/po/de_DE.po b/po/de_DE.po
index e7c66fd..021afe9 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.4\n"
+"Project-Id-Version: vdr-satip 2.3.0\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"
diff --git a/po/es_ES.po b/po/es_ES.po
index 39353be..8d8983e 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.4\n"
+"Project-Id-Version: vdr-satip 2.3.0\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"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index aa8e173..3374afc 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.4\n"
+"Project-Id-Version: vdr-satip 2.3.0\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"
diff --git a/satip.c b/satip.c
index 089c3e2..ec2f8ab 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.4" GITVERSION;
+       const char VERSION[]     = "2.3.0" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("SAT>IP Devices");
 
 class cPluginSatip : public cPlugin {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-satip.git