frodovdr
/
vdr-plugin-iptv
mirror of https://github.com/rofafor/vdr-plugin-iptv.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated for vdr-2.1.6.

This commit is contained in:
Rolf Ahrenberg 2014-03-16 16:46:21 +02:00
parent aaca7cba1a
commit dab869cf3a
10 changed files with 32 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -243,3 +243,7 @@ VDR Plugin 'iptv' Revision History
2014-03-09: Version 2.1.1 2014-03-09: Version 2.1.1
- Fixed installation target bugs (Thanks to Alexander Grothe). - Fixed installation target bugs (Thanks to Alexander Grothe).
2014-03-16: Version 2.1.2
- Updated for vdr-2.1.6.

6
iptv.c
View File

@ -13,15 +13,15 @@
#include "device.h" #include "device.h"
#include "iptvservice.h" #include "iptvservice.h"
#if defined(APIVERSNUM) && APIVERSNUM < 20104 #if defined(APIVERSNUM) && APIVERSNUM < 20106
#error "VDR-2.1.4 API version or greater is required!" #error "VDR-2.1.6 API version or greater is required!"
#endif #endif
#ifndef GITVERSION #ifndef GITVERSION
#define GITVERSION "" #define GITVERSION ""
#endif #endif
const char VERSION[] = "2.1.1" GITVERSION; const char VERSION[] = "2.1.2" GITVERSION;
static const char DESCRIPTION[] = trNOOP("Experience the IPTV"); static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
class cPluginIptv : public cPlugin { class cPluginIptv : public cPlugin {

12
po/de_DE.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-iptv 2.1.1\n" "Project-Id-Version: vdr-iptv 2.1.2\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-09 03:09+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-09 03:09+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Tobias Grimm <tg@e-tobi.net>\n" "Last-Translator: Tobias Grimm <tg@e-tobi.net>\n"
"Language-Team: German <vdr@linuxtv.org>\n" "Language-Team: German <vdr@linuxtv.org>\n"
"Language: de\n" "Language: de\n"
@ -130,12 +130,6 @@ msgstr "DATEI"
msgid "EXT" msgid "EXT"
msgstr "EXT" msgstr "EXT"
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid" msgid "Rid"
msgstr "Rid" msgstr "Rid"

12
po/fi_FI.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-iptv 2.1.1\n" "Project-Id-Version: vdr-iptv 2.1.2\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-09 03:09+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-09 03:09+0200\n" "PO-Revision-Date: 2014-03-16 03:16+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"
@ -145,12 +145,6 @@ msgstr "FILE"
msgid "EXT" msgid "EXT"
msgstr "EXT" msgstr "EXT"
msgid "Nid"
msgstr "Verkko-ID"
msgid "Tid"
msgstr "Lähete-ID"
msgid "Rid" msgid "Rid"
msgstr "Radio-ID" msgstr "Radio-ID"

12
po/fr_FR.po
View File

@ -6,10 +6,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-iptv 2.1.1\n" "Project-Id-Version: vdr-iptv 2.1.2\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-09 03:09+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-09 03:09+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n" "Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n"
"Language-Team: French <vdr@linuxtv.org>\n" "Language-Team: French <vdr@linuxtv.org>\n"
"Language: fr\n" "Language: fr\n"
@ -147,12 +147,6 @@ msgstr "FICHIER"
msgid "EXT" msgid "EXT"
msgstr "EXT" msgstr "EXT"
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid" msgid "Rid"
msgstr "Rid" msgstr "Rid"

12
po/it_IT.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-iptv 2.1.1\n" "Project-Id-Version: vdr-iptv 2.1.2\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-09 03:09+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-09 03:09+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n" "Language-Team: Italian <vdr@linuxtv.org>\n"
"Language: it\n" "Language: it\n"
@ -146,12 +146,6 @@ msgstr "FILE"
msgid "EXT" msgid "EXT"
msgstr "EXT" msgstr "EXT"
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid" msgid "Rid"
msgstr "Rid" msgstr "Rid"

12
po/nl_NL.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-iptv 2.1.1\n" "Project-Id-Version: vdr-iptv 2.1.2\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-09 03:09+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-09 03:09+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Carel\n" "Last-Translator: Carel\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n" "Language-Team: Dutch <vdr@linuxtv.org>\n"
"Language: nl\n" "Language: nl\n"
@ -145,12 +145,6 @@ msgstr "BESTAND"
msgid "EXT" msgid "EXT"
msgstr "EXT" msgstr "EXT"
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid" msgid "Rid"
msgstr "Rid" msgstr "Rid"

12
po/ru_RU.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-iptv 2.1.1\n" "Project-Id-Version: vdr-iptv 2.1.2\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-03-09 03:09+0200\n" "POT-Creation-Date: 2014-03-16 03:16+0200\n"
"PO-Revision-Date: 2014-03-09 03:09+0200\n" "PO-Revision-Date: 2014-03-16 03:16+0200\n"
"Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n" "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n" "Language-Team: Russian <vdr@linuxtv.org>\n"
"Language: ru\n" "Language: ru\n"
@ -131,12 +131,6 @@ msgstr "ФАЙЛ"
msgid "EXT" msgid "EXT"
msgstr "EXT" msgstr "EXT"
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid" msgid "Rid"
msgstr "Rid" msgstr "Rid"

20
source.c
View File

@ -136,8 +136,6 @@ const char *cIptvSourceParam::allowedProtocolCharsS = " abcdefghijklmnopqrstuvwx
cIptvSourceParam::cIptvSourceParam(char sourceP, const char *descriptionP) cIptvSourceParam::cIptvSourceParam(char sourceP, const char *descriptionP)
: cSourceParam(sourceP, descriptionP), : cSourceParam(sourceP, descriptionP),
paramM(0), paramM(0),
nidM(0),
tidM(0),
ridM(0), ridM(0),
dataM(), dataM(),
itpM() itpM()
@ -155,8 +153,6 @@ void cIptvSourceParam::SetData(cChannel *channelP)
{ {
debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters()); debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
dataM = *channelP; dataM = *channelP;
nidM = dataM.Nid();
tidM = dataM.Tid();
ridM = dataM.Rid(); ridM = dataM.Rid();
itpM.Parse(dataM.Parameters()); itpM.Parse(dataM.Parameters());
paramM = 0; paramM = 0;
@ -166,21 +162,19 @@ void cIptvSourceParam::GetData(cChannel *channelP)
{ {
debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters()); debug("cIptvSourceParam::%s(%s)", __FUNCTION__, channelP->Parameters());
channelP->SetTransponderData(channelP->Source(), channelP->Frequency(), dataM.Srate(), itpM.ToString(Source()), true); 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) cOsdItem *cIptvSourceParam::GetOsdItem(void)
{ {
debug("cIptvSourceParam::%s()", __FUNCTION__); debug("cIptvSourceParam::%s()", __FUNCTION__);
switch (paramM++) { switch (paramM++) {
case 0: return new cMenuEditIntItem( tr("Nid"), &nidM, 0); case 0: return new cMenuEditIntItem( tr("Rid"), &ridM, 0);
case 1: return new cMenuEditIntItem( tr("Tid"), &tidM, 0); case 1: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM);
case 2: return new cMenuEditIntItem( tr("Rid"), &ridM, 0); case 2: return new cMenuEditBoolItem(tr("Scan pids"), &itpM.pidScanM);
case 3: return new cMenuEditBoolItem(tr("Scan section ids"), &itpM.sidScanM); case 3: return new cMenuEditStraItem(tr("Protocol"), &itpM.protocolM, ELEMENTS(protocolsM), protocolsM);
case 4: return new cMenuEditBoolItem(tr("Scan pids"), &itpM.pidScanM); case 4: return new cMenuEditStrItem( tr("Address"), itpM.addressM, sizeof(itpM.addressM), allowedProtocolCharsS);
case 5: return new cMenuEditStraItem(tr("Protocol"), &itpM.protocolM, ELEMENTS(protocolsM), protocolsM); case 5: return new cMenuEditIntItem( tr("Parameter"), &itpM.parameterM, 0, 0xFFFF);
case 6: return new cMenuEditStrItem( tr("Address"), itpM.addressM, sizeof(itpM.addressM), allowedProtocolCharsS);
case 7: return new cMenuEditIntItem( tr("Parameter"), &itpM.parameterM, 0, 0xFFFF);
default: return NULL; default: return NULL;
} }
return NULL; return NULL;

2
source.h
View File

@ -51,8 +51,6 @@ class cIptvSourceParam : public cSourceParam
{ {
private: private:
int paramM; int paramM;
int nidM;
int tidM;
int ridM; int ridM;
cChannel dataM; cChannel dataM;
cIptvTransponderParameters itpM; cIptvTransponderParameters itpM;