diff --git a/HISTORY b/HISTORY index d8f6cb5..fa8adec 100644 --- a/HISTORY +++ b/HISTORY @@ -243,3 +243,7 @@ VDR Plugin 'iptv' Revision History 2014-03-09: Version 2.1.1 - Fixed installation target bugs (Thanks to Alexander Grothe). + +2014-03-16: Version 2.1.2 + +- Updated for vdr-2.1.6. diff --git a/iptv.c b/iptv.c index 03b9a57..dccfba7 100644 --- a/iptv.c +++ b/iptv.c @@ -13,15 +13,15 @@ #include "device.h" #include "iptvservice.h" -#if defined(APIVERSNUM) && APIVERSNUM < 20104 -#error "VDR-2.1.4 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 20106 +#error "VDR-2.1.6 API version or greater is required!" #endif #ifndef GITVERSION #define GITVERSION "" #endif - const char VERSION[] = "2.1.1" GITVERSION; + const char VERSION[] = "2.1.2" GITVERSION; static const char DESCRIPTION[] = trNOOP("Experience the IPTV"); class cPluginIptv : public cPlugin { diff --git a/po/de_DE.po b/po/de_DE.po index 1ba73af..472977d 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.1\n" +"Project-Id-Version: vdr-iptv 2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-09 03:09+0200\n" -"PO-Revision-Date: 2014-03-09 03:09+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Tobias Grimm \n" "Language-Team: German \n" "Language: de\n" @@ -130,12 +130,6 @@ msgstr "DATEI" msgid "EXT" msgstr "EXT" -msgid "Nid" -msgstr "Nid" - -msgid "Tid" -msgstr "Tid" - msgid "Rid" msgstr "Rid" diff --git a/po/fi_FI.po b/po/fi_FI.po index b529b84..496421d 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.1\n" +"Project-Id-Version: vdr-iptv 2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-09 03:09+0200\n" -"PO-Revision-Date: 2014-03-09 03:09+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish \n" "Language: fi\n" @@ -145,12 +145,6 @@ msgstr "FILE" msgid "EXT" msgstr "EXT" -msgid "Nid" -msgstr "Verkko-ID" - -msgid "Tid" -msgstr "Lähete-ID" - msgid "Rid" msgstr "Radio-ID" diff --git a/po/fr_FR.po b/po/fr_FR.po index 188da1a..737286d 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.1\n" +"Project-Id-Version: vdr-iptv 2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-09 03:09+0200\n" -"PO-Revision-Date: 2014-03-09 03:09+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: NIVAL Michaël \n" "Language-Team: French \n" "Language: fr\n" @@ -147,12 +147,6 @@ msgstr "FICHIER" msgid "EXT" msgstr "EXT" -msgid "Nid" -msgstr "Nid" - -msgid "Tid" -msgstr "Tid" - msgid "Rid" msgstr "Rid" diff --git a/po/it_IT.po b/po/it_IT.po index d77d38c..e029eaa 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.1\n" +"Project-Id-Version: vdr-iptv 2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-09 03:09+0200\n" -"PO-Revision-Date: 2014-03-09 03:09+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" "Language: it\n" @@ -146,12 +146,6 @@ msgstr "FILE" msgid "EXT" msgstr "EXT" -msgid "Nid" -msgstr "Nid" - -msgid "Tid" -msgstr "Tid" - msgid "Rid" msgstr "Rid" diff --git a/po/nl_NL.po b/po/nl_NL.po index 5761805..f92254b 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.1\n" +"Project-Id-Version: vdr-iptv 2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-09 03:09+0200\n" -"PO-Revision-Date: 2014-03-09 03:09+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Carel\n" "Language-Team: Dutch \n" "Language: nl\n" @@ -145,12 +145,6 @@ msgstr "BESTAND" msgid "EXT" msgstr "EXT" -msgid "Nid" -msgstr "Nid" - -msgid "Tid" -msgstr "Tid" - msgid "Rid" msgstr "Rid" diff --git a/po/ru_RU.po b/po/ru_RU.po index 49674fc..0cb3003 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.1\n" +"Project-Id-Version: vdr-iptv 2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-09 03:09+0200\n" -"PO-Revision-Date: 2014-03-09 03:09+0200\n" +"POT-Creation-Date: 2014-03-16 03:16+0200\n" +"PO-Revision-Date: 2014-03-16 03:16+0200\n" "Last-Translator: Alexander Gross \n" "Language-Team: Russian \n" "Language: ru\n" @@ -131,12 +131,6 @@ msgstr "ФАЙЛ" msgid "EXT" msgstr "EXT" -msgid "Nid" -msgstr "Nid" - -msgid "Tid" -msgstr "Tid" - msgid "Rid" msgstr "Rid" diff --git a/source.c b/source.c index 3c4a31e..6ccab65 100644 --- a/source.c +++ b/source.c @@ -136,8 +136,6 @@ const char *cIptvSourceParam::allowedProtocolCharsS = " abcdefghijklmnopqrstuvwx cIptvSourceParam::cIptvSourceParam(char sourceP, const char *descriptionP) : cSourceParam(sourceP, descriptionP), paramM(0), - nidM(0), - tidM(0), ridM(0), dataM(), itpM() @@ -155,8 +153,6 @@ void cIptvSourceParam::SetData(cChannel *channelP) { debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters()); dataM = *channelP; - nidM = dataM.Nid(); - tidM = dataM.Tid(); ridM = dataM.Rid(); itpM.Parse(dataM.Parameters()); paramM = 0; @@ -166,21 +162,19 @@ void cIptvSourceParam::GetData(cChannel *channelP) { debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters()); channelP->SetTransponderData(channelP->Source(), channelP->Frequency(), dataM.Srate(), itpM.ToString(Source()), true); - channelP->SetId(nidM, tidM, channelP->Sid(), ridM); + channelP->SetId(channelP->Nid(), channelP->Tid(), channelP->Sid(), ridM); } cOsdItem *cIptvSourceParam::GetOsdItem(void) { debug("cIptvSourceParam::%s()", __FUNCTION__); switch (paramM++) { - case 0: return new cMenuEditIntItem( tr("Nid"), &nidM, 0); - case 1: return new cMenuEditIntItem( tr("Tid"), &tidM, 0); - case 2: return new cMenuEditIntItem( tr("Rid"), &ridM, 0); - case 3: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM); - case 4: return new cMenuEditBoolItem(tr("Scan pids"), &itpM.pidScanM); - case 5: return new cMenuEditStraItem(tr("Protocol"), &itpM.protocolM, ELEMENTS(protocolsM), protocolsM); - case 6: return new cMenuEditStrItem( tr("Address"), itpM.addressM, sizeof(itpM.addressM), allowedProtocolCharsS); - case 7: return new cMenuEditIntItem( tr("Parameter"), &itpM.parameterM, 0, 0xFFFF); + case 0: return new cMenuEditIntItem( tr("Rid"), &ridM, 0); + case 1: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM); + case 2: return new cMenuEditBoolItem(tr("Scan pids"), &itpM.pidScanM); + case 3: return new cMenuEditStraItem(tr("Protocol"), &itpM.protocolM, ELEMENTS(protocolsM), protocolsM); + case 4: return new cMenuEditStrItem( tr("Address"), itpM.addressM, sizeof(itpM.addressM), allowedProtocolCharsS); + case 5: return new cMenuEditIntItem( tr("Parameter"), &itpM.parameterM, 0, 0xFFFF); default: return NULL; } return NULL; diff --git a/source.h b/source.h index 5e8ca13..5f3f1e8 100644 --- a/source.h +++ b/source.h @@ -51,8 +51,6 @@ class cIptvSourceParam : public cSourceParam { private: int paramM; - int nidM; - int tidM; int ridM; cChannel dataM; cIptvTransponderParameters itpM;