Changed 'TrustedTransponder' to 'TimeTransponder'1.0.0pre4

5 files changed, 11 insertions, 11 deletions

diff --git a/HISTORY b/HISTORY
index b3961965..708f6d9d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1092,7 +1092,7 @@ Video Disk Recorder Revision History
   activity, but this should be no problem for normal use).
 - Changed the MANUAL description of the "Conditional Access" setup parameters
   to reflect the actual "CICAM DVBn m" notation in the "Setup" menu.
-- The new Setup parameter TrustedTransponder can be used to define which
+- The new Setup parameter "Use time from transponder" can be used to define which
   transponder shall be used to set the system time (see MANUAL for details).
   If you have been using the SetSystemTime option previously, you now MUST
   select a channel that you trust to have a reliable time base.
diff --git a/config.c b/config.c
index 4bed561e..b89fe748 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.90 2002/03/10 12:22:25 kls Exp $
+ * $Id: config.c 1.91 2002/03/17 14:24:09 kls Exp $
  */
 
 #include "config.h"
@@ -931,7 +931,7 @@ cSetup::cSetup(void)
   LnbFrequHi = 10600;
   DiSEqC = 0;
   SetSystemTime = 0;
-  TrustedTransponder = 0;
+  TimeTransponder = 0;
   MarginStart = 2;
   MarginStop = 10;
   EPGScanTimeout = 5;
@@ -1018,7 +1018,7 @@ bool cSetup::Parse(char *s)
         else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
         else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
         else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
-        else if (!strcasecmp(Name, "TrustedTransponder"))  TrustedTransponder = atoi(Value);
+        else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
         else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
         else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
         else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
@@ -1100,7 +1100,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
         fprintf(f, "DiSEqC             = %d\n", DiSEqC);
         fprintf(f, "SetSystemTime      = %d\n", SetSystemTime);
-        fprintf(f, "TrustedTransponder = %d\n", TrustedTransponder);
+        fprintf(f, "TimeTransponder    = %d\n", TimeTransponder);
         fprintf(f, "MarginStart        = %d\n", MarginStart);
         fprintf(f, "MarginStop         = %d\n", MarginStop);
         fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
diff --git a/config.h b/config.h
index e3cd3add..4a216f13 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.104 2002/03/10 12:45:11 kls Exp $
+ * $Id: config.h 1.105 2002/03/17 14:24:11 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -342,7 +342,7 @@ public:
   int LnbFrequHi;
   int DiSEqC;
   int SetSystemTime;
-  int TrustedTransponder;
+  int TimeTransponder;
   int MarginStart, MarginStop;
   int EPGScanTimeout;
   int EPGBugfixLevel;
diff --git a/eit.c b/eit.c
index e0b33f69..011000b7 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.40 2002/03/10 12:45:38 kls Exp $
+ * $Id: eit.c 1.41 2002/03/17 14:23:41 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1137,7 +1137,7 @@ void cSIProcessor::Action()
                         case 0x14:
                            if (buf[0] == 0x70)
                            {
-                              if (Setup.SetSystemTime && Setup.TrustedTransponder && ISTRANSPONDER(currentTransponder, Setup.TrustedTransponder))
+                              if (Setup.SetSystemTime && Setup.TimeTransponder && ISTRANSPONDER(currentTransponder, Setup.TimeTransponder))
                               {
                                  cTDT ctdt((tdt_t *)buf);
                                  ctdt.SetSystemTime();
diff --git a/menu.c b/menu.c
index 5d22a3a6..93f1ff7d 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.171 2002/03/17 13:50:27 kls Exp $
+ * $Id: menu.c 1.172 2002/03/17 14:23:44 kls Exp $
  */
 
 #include "menu.h"
@@ -2015,7 +2015,7 @@ void cMenuSetupEPG::Set(void)
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout"),          &data.EPGScanTimeout));
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG bugfix level"),          &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
   Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"),           &data.SetSystemTime));
-  Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TrustedTransponder));
+  Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder));
 }
 
 // --- cMenuSetupDVB ---------------------------------------------------------