Added nid/tid/rid into the channel editor.

This commit is contained in:
Rolf Ahrenberg 2010-03-04 18:22:28 +02:00
parent aa620a314c
commit 906438e981
7 changed files with 69 additions and 43 deletions

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: iptv 0.4.0\n"
"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
"POT-Creation-Date: 2010-03-04 16:42+0200\n"
"POT-Creation-Date: 2010-03-04 18:12+0200\n"
"PO-Revision-Date: 2007-10-29 21:19+0100\n"
"Last-Translator: Tobias Grimm <tg@e-tobi.net>\n"
"Language-Team: German\n"
@ -126,6 +126,15 @@ msgstr "DATEI"
msgid "EXT"
msgstr "EXT"
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid"
msgstr "Rid"
msgid "Scan sid"
msgstr "Scanne SID"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: iptv 0.4.0\n"
"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
"POT-Creation-Date: 2010-03-04 16:42+0200\n"
"POT-Creation-Date: 2010-03-04 18:12+0200\n"
"PO-Revision-Date: 2007-08-12 23:22+0300\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -141,6 +141,15 @@ msgstr "FILE"
msgid "EXT"
msgstr "EXT"
msgid "Nid"
msgstr "Verkko-ID"
msgid "Tid"
msgstr "Lähete-ID"
msgid "Rid"
msgstr "Radio-ID"
msgid "Scan sid"
msgstr "Etsi palvelu-ID"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: iptv 0.4.0\n"
"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
"POT-Creation-Date: 2010-03-04 16:42+0200\n"
"POT-Creation-Date: 2010-03-04 18:12+0200\n"
"PO-Revision-Date: 2008-01-26 13:14+0100\n"
"Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n"
"Language-Team: French\n"
@ -143,7 +143,15 @@ msgstr "FICHIER"
msgid "EXT"
msgstr "EXT"
#, fuzzy
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid"
msgstr "Rid"
msgid "Scan sid"
msgstr "Scanne les SID"
@ -158,34 +166,3 @@ msgstr "Adresse"
msgid "Parameter"
msgstr "Paramètre"
#, fuzzy
#~ msgid "File"
#~ msgstr "Filtres"
#~ msgid "Delay (ms)"
#~ msgstr "Délai (ms)"
#~ msgid "Script"
#~ msgstr "Script"
#~ msgid "Port"
#~ msgstr "Port"
#~ msgid "Vtype"
#~ msgstr "Vtype"
#~ msgid "Nid"
#~ msgstr "Nid"
#~ msgid "Tid"
#~ msgstr "Tid"
#~ msgid "Rid"
#~ msgstr "Rid"
#~ msgid "Cannot find unique channel settings!"
#~ msgstr "Impossible de trouver un paramètre de chaîne unique !"
#~ msgid "IPTV Channels"
#~ msgstr "Canal IPTV"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: iptv 0.4.0\n"
"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
"POT-Creation-Date: 2010-03-04 16:42+0200\n"
"POT-Creation-Date: 2010-03-04 18:12+0200\n"
"PO-Revision-Date: 2008-07-13 03:28+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian\n"
@ -142,6 +142,15 @@ msgstr "FILE"
msgid "EXT"
msgstr "EXT"
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid"
msgstr "Rid"
msgid "Scan sid"
msgstr "Scansione Sid"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: iptv 0.4.0\n"
"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
"POT-Creation-Date: 2010-03-04 16:42+0200\n"
"POT-Creation-Date: 2010-03-04 18:12+0200\n"
"PO-Revision-Date: 2008-03-16 12:14+0100\n"
"Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
"Language-Team: Russian <de@li.org>\n"
@ -127,6 +127,15 @@ msgstr "ФАЙЛ"
msgid "EXT"
msgstr "EXT"
msgid "Nid"
msgstr "Nid"
msgid "Tid"
msgstr "Tid"
msgid "Rid"
msgstr "Rid"
msgid "Scan sid"
msgstr "Сканировать SID"

View File

@ -112,7 +112,10 @@ bool cIptvTransponderParameters::Parse(const char *s)
cIptvSourceParam::cIptvSourceParam(char Source, const char *Description)
: cSourceParam(Source, Description),
param(0)
param(0),
nid(0),
tid(0),
rid(0)
{
debug("cIptvSourceParam::cIptvSourceParam(): Source=%c Description=%s\n", Source, Description);
@ -126,6 +129,9 @@ void cIptvSourceParam::SetData(cChannel *Channel)
{
debug("cIptvSourceParam::SetData(): Channel=%s)\n", Channel->Parameters());
data = *Channel;
nid = data.Nid();
tid = data.Tid();
rid = data.Rid();
itp.Parse(data.Parameters());
param = 0;
}
@ -134,6 +140,7 @@ void cIptvSourceParam::GetData(cChannel *Channel)
{
debug("cIptvSourceParam::GetData(): Channel=%s\n", Channel->Parameters());
data.SetTransponderData(Channel->Source(), Channel->Frequency(), data.Srate(), itp.ToString(Source()), true);
data.SetId(nid, tid, Channel->Sid(), rid);
*Channel = data;
}
@ -141,11 +148,14 @@ cOsdItem *cIptvSourceParam::GetOsdItem(void)
{
debug("cIptvSourceParam::GetOsdItem()\n");
switch (param++) {
case 0: return new cMenuEditBoolItem(tr("Scan sid"), &itp.sidscan);
case 1: return new cMenuEditBoolItem(tr("Scan pids"), &itp.pidscan);
case 2: return new cMenuEditStraItem(tr("Protocol"), &itp.protocol, ELEMENTS(protocols), protocols);
case 3: return new cMenuEditStrItem( tr("Address"), itp.address, sizeof(itp.address));
case 4: return new cMenuEditIntItem( tr("Parameter"), &itp.parameter, 0, 0xFFFF);
case 0: return new cMenuEditIntItem( tr("Nid"), &nid, 0);
case 1: return new cMenuEditIntItem( tr("Tid"), &tid, 0);
case 2: return new cMenuEditIntItem( tr("Rid"), &rid, 0);
case 3: return new cMenuEditBoolItem(tr("Scan sid"), &itp.sidscan);
case 4: return new cMenuEditBoolItem(tr("Scan pids"), &itp.pidscan);
case 5: return new cMenuEditStraItem(tr("Protocol"), &itp.protocol, ELEMENTS(protocols), protocols);
case 6: return new cMenuEditStrItem( tr("Address"), itp.address, sizeof(itp.address));
case 7: return new cMenuEditIntItem( tr("Parameter"), &itp.parameter, 0, 0xFFFF);
default: return NULL;
}
return NULL;

View File

@ -50,6 +50,9 @@ class cIptvSourceParam : public cSourceParam
{
private:
int param;
int nid;
int tid;
int rid;
cChannel data;
cIptvTransponderParameters itp;
const char *protocols[cIptvTransponderParameters::eProtocolCount];