frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

Updated version to 2.2.0.

Browse Source
This commit is contained in:
Rolf Ahrenberg 2015-02-08 22:35:35 +02:00
parent df258d127f
commit 26cd34f965
10 changed files with 23 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
HISTORY
View File

@ -109,7 +109,12 @@ VDR Plugin 'satip' Revision History
Gabriel Bonich). Gabriel Bonich).
- Updated German translations (Thanks to Frank Neumann). - 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. - Fixed memory deallocation errors.
- Cleaned up all scan-build warnings. - Cleaned up all scan-build warnings.

4
README
View File

@ -26,9 +26,7 @@ Requirements:
- Glibc >= 2.12 - the GNU C library (recvmmsg) - Glibc >= 2.12 - the GNU C library (recvmmsg)
http://www.gnu.org/software/libc/ http://www.gnu.org/software/libc/
- VDR >= 2.1.4 for scrambled channels - VDR >= 2.1.7
- VDR >= 2.1.7 for external CI
Description: Description:

7
device.c
View File

@ -433,10 +433,7 @@ int cSatipDevice::GetId(void)
int cSatipDevice::GetPmtPid(void) int cSatipDevice::GetPmtPid(void)
{ {
int pid = 0; int pid = channelM.Ca() ? ::GetPmtPid(channelM.Source(), channelM.Transponder(), channelM.Sid()) : 0;
#if defined(APIVERSNUM) && APIVERSNUM >= 20107
pid = channelM.Ca() ? ::GetPmtPid(channelM.Source(), channelM.Transponder(), channelM.Sid()) : 0;
#endif
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); 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; return pid;
} }
@ -505,7 +502,6 @@ bool cSatipDevice::GetTSPacket(uchar *&dataP)
{ {
debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM); debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
if (tsBufferM) { if (tsBufferM) {
#if defined(APIVERSNUM) && APIVERSNUM >= 20104
if (cCamSlot *cs = CamSlot()) { if (cCamSlot *cs = CamSlot()) {
if (cs->WantsTsData()) { if (cs->WantsTsData()) {
int available; int available;
@ -517,7 +513,6 @@ bool cSatipDevice::GetTSPacket(uchar *&dataP)
return true; return true;
} }
} }
#endif
dataP = GetData(); dataP = GetData();
return true; return true;
} }

6
param.c
View File

@ -147,15 +147,9 @@ cString GetTransponderUrlParameters(const cChannel *channelP)
cDvbTransponderParameters dtp(channelP->Parameters()); cDvbTransponderParameters dtp(channelP->Parameters());
int DataSlice = 0; int DataSlice = 0;
int C2TuningFrequencyType = 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 Pilot = dtp.Pilot();
int T2SystemId = dtp.T2SystemId(); int T2SystemId = dtp.T2SystemId();
int SisoMiso = dtp.SisoMiso(); int SisoMiso = dtp.SisoMiso();
#endif
float freq = channelP->Frequency(); float freq = channelP->Frequency();
char type = cSource::ToChar(channelP->Source()); char type = cSource::ToChar(channelP->Source());
cSource *source = Sources.Get(channelP->Source()); cSource *source = Sources.Get(channelP->Source());

6
po/ca_ES.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-satip 2.0.0\n" "Project-Id-Version: vdr-satip 2.2.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2015-01-25 01:25+0200\n" "POT-Creation-Date: 2015-02-19 02:19+0200\n"
"PO-Revision-Date: 2015-01-25 01:25+0200\n" "PO-Revision-Date: 2015-02-19 02:19+0200\n"
"Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n" "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
"Language-Team: Catalan <vdr@linuxtv.org>\n" "Language-Team: Catalan <vdr@linuxtv.org>\n"
"Language: ca\n" "Language: ca\n"

6
po/de_DE.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-satip 2.0.0\n" "Project-Id-Version: vdr-satip 2.2.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2015-01-25 01:25+0200\n" "POT-Creation-Date: 2015-02-19 02:19+0200\n"
"PO-Revision-Date: 2015-01-25 01:25+0200\n" "PO-Revision-Date: 2015-02-19 02:19+0200\n"
"Last-Translator: Frank Neumann <fnu@yavdr.org>\n" "Last-Translator: Frank Neumann <fnu@yavdr.org>\n"
"Language-Team: German <vdr@linuxtv.org>\n" "Language-Team: German <vdr@linuxtv.org>\n"
"Language: de\n" "Language: de\n"

6
po/es_ES.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-satip 2.0.0\n" "Project-Id-Version: vdr-satip 2.2.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2015-01-25 01:25+0200\n" "POT-Creation-Date: 2015-02-19 02:19+0200\n"
"PO-Revision-Date: 2015-01-25 01:25+0200\n" "PO-Revision-Date: 2015-02-19 02:19+0200\n"
"Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n" "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n" "Language-Team: Spanish <vdr@linuxtv.org>\n"
"Language: es\n" "Language: es\n"

6
po/fi_FI.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-satip 2.0.0\n" "Project-Id-Version: vdr-satip 2.2.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2015-01-25 01:25+0200\n" "POT-Creation-Date: 2015-02-19 02:19+0200\n"
"PO-Revision-Date: 2015-01-25 01:25+0200\n" "PO-Revision-Date: 2015-02-19 02:19+0200\n"
"Last-Translator: Rolf Ahrenberg\n" "Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n"
"Language: fi\n" "Language: fi\n"

6
satip.c
View File

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

28
tuner.h
View File

@ -8,7 +8,6 @@
#ifndef __SATIP_TUNER_H #ifndef __SATIP_TUNER_H
#define __SATIP_TUNER_H #define __SATIP_TUNER_H
#include <vdr/config.h> // APIVERSNUM
#include <vdr/thread.h> #include <vdr/thread.h>
#include <vdr/tools.h> #include <vdr/tools.h>
@ -28,33 +27,6 @@ private:
} }
public: 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) void RemovePid(const int &pidP)
{ {
if (RemoveElement(pidP)) if (RemoveElement(pidP))