From 26cd34f965970972b668e02765e31314c6e58d7f Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Sun, 8 Feb 2015 22:35:35 +0200 Subject: [PATCH] Updated version to 2.2.0. --- HISTORY | 7 ++++++- README | 4 +--- device.c | 7 +------ param.c | 6 ------ po/ca_ES.po | 6 +++--- po/de_DE.po | 6 +++--- po/es_ES.po | 6 +++--- po/fi_FI.po | 6 +++--- satip.c | 6 +++--- tuner.h | 28 ---------------------------- 10 files changed, 23 insertions(+), 59 deletions(-) diff --git a/HISTORY b/HISTORY index ee06bd3..d25a318 100644 --- a/HISTORY +++ b/HISTORY @@ -109,7 +109,12 @@ VDR Plugin 'satip' Revision History Gabriel Bonich). - Updated German translations (Thanks to Frank Neumann). -2015-01-25: Version 2.0.0 + +=================================== +VDR Plugin 'satip' Revision History +=================================== + +2015-02-19: Version 2.2.0 - Fixed memory deallocation errors. - Cleaned up all scan-build warnings. diff --git a/README b/README index 07139d9..1c50b54 100644 --- a/README +++ b/README @@ -26,9 +26,7 @@ Requirements: - Glibc >= 2.12 - the GNU C library (recvmmsg) http://www.gnu.org/software/libc/ -- VDR >= 2.1.4 for scrambled channels - -- VDR >= 2.1.7 for external CI +- VDR >= 2.1.7 Description: diff --git a/device.c b/device.c index d780bc1..81fcd96 100644 --- a/device.c +++ b/device.c @@ -433,10 +433,7 @@ int cSatipDevice::GetId(void) int cSatipDevice::GetPmtPid(void) { - int pid = 0; -#if defined(APIVERSNUM) && APIVERSNUM >= 20107 - pid = channelM.Ca() ? ::GetPmtPid(channelM.Source(), channelM.Transponder(), channelM.Sid()) : 0; -#endif + int pid = channelM.Ca() ? ::GetPmtPid(channelM.Source(), channelM.Transponder(), channelM.Sid()) : 0; debug11("%s pmtpid=%d source=%c transponder=%d sid=%d name=%s [device %u]", __PRETTY_FUNCTION__, pid, cSource::ToChar(channelM.Source()), channelM.Transponder(), channelM.Sid(), channelM.Name(), deviceIndexM); return pid; } @@ -505,7 +502,6 @@ bool cSatipDevice::GetTSPacket(uchar *&dataP) { debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM); if (tsBufferM) { -#if defined(APIVERSNUM) && APIVERSNUM >= 20104 if (cCamSlot *cs = CamSlot()) { if (cs->WantsTsData()) { int available; @@ -517,7 +513,6 @@ bool cSatipDevice::GetTSPacket(uchar *&dataP) return true; } } -#endif dataP = GetData(); return true; } diff --git a/param.c b/param.c index b4a5faf..03caa48 100644 --- a/param.c +++ b/param.c @@ -147,15 +147,9 @@ cString GetTransponderUrlParameters(const cChannel *channelP) cDvbTransponderParameters dtp(channelP->Parameters()); int DataSlice = 0; int C2TuningFrequencyType = 0; -#if defined(APIVERSNUM) && APIVERSNUM < 20106 - int Pilot = PILOT_AUTO; - int T2SystemId = 0; - int SisoMiso = 0; -#else int Pilot = dtp.Pilot(); int T2SystemId = dtp.T2SystemId(); int SisoMiso = dtp.SisoMiso(); -#endif float freq = channelP->Frequency(); char type = cSource::ToChar(channelP->Source()); cSource *source = Sources.Get(channelP->Source()); diff --git a/po/ca_ES.po b/po/ca_ES.po index 02c875a..e9ef289 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 2.0.0\n" +"Project-Id-Version: vdr-satip 2.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-25 01:25+0200\n" -"PO-Revision-Date: 2015-01-25 01:25+0200\n" +"POT-Creation-Date: 2015-02-19 02:19+0200\n" +"PO-Revision-Date: 2015-02-19 02:19+0200\n" "Last-Translator: Gabriel Bonich \n" "Language-Team: Catalan \n" "Language: ca\n" diff --git a/po/de_DE.po b/po/de_DE.po index 858731f..9cd77ec 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 2.0.0\n" +"Project-Id-Version: vdr-satip 2.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-25 01:25+0200\n" -"PO-Revision-Date: 2015-01-25 01:25+0200\n" +"POT-Creation-Date: 2015-02-19 02:19+0200\n" +"PO-Revision-Date: 2015-02-19 02:19+0200\n" "Last-Translator: Frank Neumann \n" "Language-Team: German \n" "Language: de\n" diff --git a/po/es_ES.po b/po/es_ES.po index 8c4b399..724f5fb 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 2.0.0\n" +"Project-Id-Version: vdr-satip 2.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-25 01:25+0200\n" -"PO-Revision-Date: 2015-01-25 01:25+0200\n" +"POT-Creation-Date: 2015-02-19 02:19+0200\n" +"PO-Revision-Date: 2015-02-19 02:19+0200\n" "Last-Translator: Gabriel Bonich \n" "Language-Team: Spanish \n" "Language: es\n" diff --git a/po/fi_FI.po b/po/fi_FI.po index 75c524d..0b27822 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 2.0.0\n" +"Project-Id-Version: vdr-satip 2.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-25 01:25+0200\n" -"PO-Revision-Date: 2015-01-25 01:25+0200\n" +"POT-Creation-Date: 2015-02-19 02:19+0200\n" +"PO-Revision-Date: 2015-02-19 02:19+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/satip.c b/satip.c index 479267f..3183d4d 100644 --- a/satip.c +++ b/satip.c @@ -19,15 +19,15 @@ #warning "CURL version >= 7.36.0 is recommended" #endif -#if defined(APIVERSNUM) && APIVERSNUM < 20000 -#error "VDR-2.0.0 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 20107 +#error "VDR-2.1.7 API version or greater is required!" #endif #ifndef GITVERSION #define GITVERSION "" #endif - const char VERSION[] = "2.0.0" GITVERSION; + const char VERSION[] = "2.2.0" GITVERSION; static const char DESCRIPTION[] = trNOOP("SAT>IP Devices"); class cPluginSatip : public cPlugin { diff --git a/tuner.h b/tuner.h index c5802ca..f471eaa 100644 --- a/tuner.h +++ b/tuner.h @@ -8,7 +8,6 @@ #ifndef __SATIP_TUNER_H #define __SATIP_TUNER_H -#include // APIVERSNUM #include #include @@ -28,33 +27,6 @@ private: } public: -#if defined(APIVERSNUM) && APIVERSNUM < 20107 - int IndexOf(const int &pidP) - { - for (int i = 0; i < Size(); ++i) { - if (pidP == At(i)) - return i; - } - return -1; - } - bool RemoveElement(const int &pidP) - { - int i = IndexOf(pidP); - if (i >= 0) { - Remove(i); - return true; - } - return false; - } - bool AppendUnique(int pidP) - { - if (IndexOf(pidP) < 0) { - Append(pidP); - return true; - } - return false; - } -#endif void RemovePid(const int &pidP) { if (RemoveElement(pidP))