From a3ac10b92110bc73456add7c447b40c9dc6bdd3a Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Thu, 11 Oct 2007 23:34:27 +0000
Subject: [PATCH] Added Nid and Tid menuitems to channel editor and updated
 README.

---
 README      |  9 +++++++++
 po/fi_FI.po | 38 +++++++++++++++++++++++---------------
 setup.c     |  4 +++-
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/README b/README
index 1334ae5..5868858 100644
--- a/README
+++ b/README
@@ -101,3 +101,12 @@ Configuration:
 
   # IGMP required by multicasts
   iptables -A INPUT -i eth0 -p igmp -d 224.0.0.0/4 -j ACCEPT
+
+Notes:
+
+- Working EIT requires correct Nid/Tid/Sid values as the NIT filter cannot
+  determine the type (satellite/cable/terrestrial) of the IPTV transport
+  stream.
+
+- The following section filters are recommended to be disabled:
+  "NIT (0x40)", "SDT (0x42)", "TDT (0x70)"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index b8f46e6..d2b4893 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-10-10 22:27+0300\n"
+"POT-Creation-Date: 2007-10-12 02:23+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -76,62 +76,70 @@ msgid "Port"
 msgstr "Portti"
 
 #: setup.c:197
+msgid "Nid"
+msgstr "Verkko-ID"
+
+#: setup.c:198
+msgid "Tid"
+msgstr "Lähete-ID"
+
+#: setup.c:199
 msgid "Rid"
 msgstr "Radio-ID"
 
-#: setup.c:269
+#: setup.c:271
 msgid "Cannot find unique channel settings!"
 msgstr "Yksilöllisiä kanava-asetuksia ei löydetä!"
 
-#: setup.c:343
+#: setup.c:345
 msgid "IPTV Channels"
 msgstr "IPTV-kanavat"
 
-#: setup.c:493
+#: setup.c:495
 msgid "IPTV Information"
 msgstr "IPTV-tiedot"
 
-#: setup.c:496
+#: setup.c:498
 msgid "Bits/bytes"
 msgstr "Bitit/tavut"
 
-#: setup.c:496
+#: setup.c:498
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: setup.c:496
+#: setup.c:498
 msgid "General"
 msgstr "Yleiset"
 
-#: setup.c:496
+#: setup.c:498
 msgid "Pids"
 msgstr "Pidit"
 
-#: setup.c:509
+#: setup.c:511
 msgid "IPTV information not available!"
 msgstr "IPTV-tietoja ei saatavilla!"
 
-#: setup.c:589
+#: setup.c:591
 msgid "TS buffer size [MB]"
 msgstr "TS-puskurin koko [MB]"
 
-#: setup.c:590
+#: setup.c:592
 msgid "TS buffer prefill ratio [%]"
 msgstr "TS-puskurin esitäyttöaste [%]"
 
-#: setup.c:591
+#: setup.c:593
 msgid "Use section filtering"
 msgstr "Käytä sektioiden suodatusta"
 
-#: setup.c:593
+#: setup.c:595
 msgid "Scan Sid automatically"
 msgstr "Etsi palvelu-ID automaattisesti"
 
-#: setup.c:594
+#: setup.c:596
 msgid "Disable filters"
 msgstr "Poista suodattimia käytöstä"
 
 #. TRANSLATORS: note the singular!
-#: setup.c:597
+#: setup.c:599
 msgid "Disable filter"
 msgstr "Poista suodatin käytöstä"
diff --git a/setup.c b/setup.c
index 598227c..c194bff 100644
--- a/setup.c
+++ b/setup.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c,v 1.30 2007/10/11 19:54:20 rahrenbe Exp $
+ * $Id: setup.c,v 1.31 2007/10/11 23:34:27 rahrenbe Exp $
  */
 
 #include <string.h>
@@ -194,6 +194,8 @@ void cIptvMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem(trVDR("Tpid"),      &data.tpid,     0, 0x1FFF));
   Add(new cMenuEditIntItem(trVDR("CA"),        &data.caids[0], 0, 0xFFFF));
   Add(new cMenuEditIntItem(trVDR("Sid"),       &data.sid,      1, 0xFFFF));
+  Add(new cMenuEditIntItem(tr   ("Nid"),       &data.nid,      0, 0xFFFF));
+  Add(new cMenuEditIntItem(tr   ("Tid"),       &data.tid,      0, 0xFFFF));
   Add(new cMenuEditIntItem(tr   ("Rid"),       &data.rid,      0, 0x1FFF));
   SetCurrent(Get(current));
   Display();