From 906438e981ee39da2f197a4e6b8734af438f7526 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Thu, 4 Mar 2010 18:22:28 +0200 Subject: [PATCH] Added nid/tid/rid into the channel editor. --- po/de_DE.po | 11 ++++++++++- po/fi_FI.po | 11 ++++++++++- po/fr_FR.po | 43 ++++++++++--------------------------------- po/it_IT.po | 11 ++++++++++- po/ru_RU.po | 11 ++++++++++- source.c | 22 ++++++++++++++++------ source.h | 3 +++ 7 files changed, 69 insertions(+), 43 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 10f18f9..1d8109d 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -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 \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" diff --git a/po/fi_FI.po b/po/fi_FI.po index 3a299a0..2250e30 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -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: \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" diff --git a/po/fr_FR.po b/po/fr_FR.po index 05a3379..45fcdbd 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -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 \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" diff --git a/po/it_IT.po b/po/it_IT.po index 61e0ccd..46a7f45 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -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 \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" diff --git a/po/ru_RU.po b/po/ru_RU.po index ce1c496..6599a2f 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -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 \n" "Language-Team: Russian \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" diff --git a/source.c b/source.c index 990b328..d767dc9 100644 --- a/source.c +++ b/source.c @@ -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; diff --git a/source.h b/source.h index 642cb9b..4d46fd4 100644 --- a/source.h +++ b/source.h @@ -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];