viaccess: add TPS AU source switch option

diff --git a/po/de_DE.po b/po/de_DE.po
index 77b2e675008da2a6a5e575033ce8ff6cac4f9230..03f252933c7a572ca2bfed30587955e24071bd95 100644 (file)
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.9\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -216,3 +216,12 @@ msgstr "SC-Seca: EMM updates"
 
 msgid "SC-Seca: activate PPV"
 msgstr "SC-Seca: PPV aktivieren"
+
+msgid "stream"
+msgstr "Datenstrom"
+
+msgid "tps.bin"
+msgstr "tps.bin"
+
+msgid "Viaccess: TPS updates from"
+msgstr "Viaccess: TPS updates aus"

diff --git a/po/fi_FI.po b/po/fi_FI.po
index 9656dad5bb8e6dcdc45624df3b7db408c846a805..613c727eac17d31cbdbc3a29a0bd35d5a3a4b272 100644 (file)
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.9\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -216,3 +216,12 @@ msgstr "SC-Seca: EMM-p
 
 msgid "SC-Seca: activate PPV"
 msgstr "SC-Seca: Aktivoi PPV"
+
+msgid "stream"
+msgstr ""
+
+msgid "tps.bin"
+msgstr ""
+
+msgid "Viaccess: TPS updates from"
+msgstr ""

diff --git a/po/fr_FR.po b/po/fr_FR.po
index 3d8bb41084d1ba34baa0d2fa55191fdcefe89f9d..16f362d8d8e38a38167b193e593987399b3043fd 100644 (file)
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.9\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -216,3 +216,12 @@ msgstr "SC-Seca: mise 
 
 msgid "SC-Seca: activate PPV"
 msgstr "SC-Seca: activer les PPV"
+
+msgid "stream"
+msgstr ""
+
+msgid "tps.bin"
+msgstr ""
+
+msgid "Viaccess: TPS updates from"
+msgstr ""

diff --git a/po/hu_HU.po b/po/hu_HU.po
index 22994eeb657729a9b92d4b8ac5f951ecc1bb6b73..ab3e0c7d27b511a5a88e8d5adbdc1124efc48c1e 100644 (file)
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.11\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2007-11-01 16:45+0200\n"
 "Last-Translator: jv\n"
 "Language-Team: somebody\n"
@@ -216,3 +216,12 @@ msgstr "SC-Seca: EMM frissítés"
 
 msgid "SC-Seca: activate PPV"
 msgstr "SC-Seca: aktiváld a PPV-t"
+
+msgid "stream"
+msgstr ""
+
+msgid "tps.bin"
+msgstr ""
+
+msgid "Viaccess: TPS updates from"
+msgstr ""

diff --git a/po/it_IT.po b/po/it_IT.po
index 5dd477347eaea6285c7bcb4eb9a2040b71e60da2..5440752e389bd76bd53e525ee1b1e65044edd96d 100644 (file)
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.9\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -216,3 +216,12 @@ msgstr "SC-Seca: aggiornamenti EMM"
 
 msgid "SC-Seca: activate PPV"
 msgstr "SC-Seca: attiva PPV"
+
+msgid "stream"
+msgstr ""
+
+msgid "tps.bin"
+msgstr ""
+
+msgid "Viaccess: TPS updates from"
+msgstr ""

diff --git a/po/nl_NL.po b/po/nl_NL.po
index b8d74a3850e987fca3c8af7ad1e4633cbe436bde..914b6499af88e317d8e8cebed2a33698d51b9c6d 100644 (file)
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.9\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -216,3 +216,12 @@ msgstr "SC-Seca: EMM updates"
 
 msgid "SC-Seca: activate PPV"
 msgstr "SC-Seca: activeer PPV"
+
+msgid "stream"
+msgstr ""
+
+msgid "tps.bin"
+msgstr ""
+
+msgid "Viaccess: TPS updates from"
+msgstr ""

diff --git a/po/pl_PL.po b/po/pl_PL.po
index c50a644a216e48bde6e98f792fdb54bfda4c2d14..cfbcfde2a1d91820dee607df28fd4cc9e22cd63c 100644 (file)
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.9\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -216,3 +216,12 @@ msgstr "SC-Seca: aktualizacje EMM"
 
 msgid "SC-Seca: activate PPV"
 msgstr "SC-Seca: aktywuj PPV"
+
+msgid "stream"
+msgstr ""
+
+msgid "tps.bin"
+msgstr ""
+
+msgid "Viaccess: TPS updates from"
+msgstr ""

diff --git a/po/ru_RU.po b/po/ru_RU.po
index 588ef2290c4c3d21402e6150340a4bd087ed6fd6..86dab966f8e31b700d5f88ea2d56b3b8310406e8 100644 (file)
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.9\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2008-03-13 15:43+0100\n"
 "Last-Translator: somebody\n"
 "Language-Team: ru\n"
@@ -217,3 +217,12 @@ msgstr "SC-Seca: 
 
 msgid "SC-Seca: activate PPV"
 msgstr "SC-Seca: ÐÚâØÒØàÞÒÐâì PPV"
+
+msgid "stream"
+msgstr ""
+
+msgid "tps.bin"
+msgstr ""
+
+msgid "Viaccess: TPS updates from"
+msgstr ""

diff --git a/po/sv_SE.po b/po/sv_SE.po
index 21376e8431651ed8db1b6b5558edb2e3ec6f2c1a..51e877ddf33475cc41b10e921ba17077afe3dd8e 100644 (file)
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.9\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2008-01-18 18:31+0100\n"
+"POT-Creation-Date: 2008-08-11 19:27-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -216,3 +216,12 @@ msgstr ""
 
 msgid "SC-Seca: activate PPV"
 msgstr ""
+
+msgid "stream"
+msgstr ""
+
+msgid "tps.bin"
+msgstr ""
+
+msgid "Viaccess: TPS updates from"
+msgstr ""

diff --git a/systems/viaccess/tps.c b/systems/viaccess/tps.c
index 084dc2ff15d3ba0eb3c553085837edf541196bcc..31b2ea545f808ba8ed657e44d837b5a8db052297 100644 (file)
--- a/systems/viaccess/tps.c
+++ b/systems/viaccess/tps.c
@@ -589,6 +589,10 @@ public:
 
 cTpsKeys tpskeys;
 
+#define AU_STREAM 0
+#define AU_TPSBIN 1
+int tpsAuMode=AU_STREAM;
+
 cTpsKeys::cTpsKeys(void)
 :cStructListPlain<cTpsKey>("TPS keys","tps.cache",SL_READWRITE|SL_MISSINGOK|SL_WATCH|SL_NOPURGE)
 ,lastLoad(-LOADBIN_TIME)
@@ -649,7 +653,7 @@ void cTpsKeys::Check(time_t now, int cardnum)
     lastLoad.Set();
     }
 */
-  if(lastAu.Elapsed()>(nokey ? TPSAU_TIME/60 : TPSAU_TIME)) {
+  if(tpsAuMode==AU_STREAM && lastAu.Elapsed()>(nokey ? TPSAU_TIME/60 : TPSAU_TIME)) {
     if(ScSetup.AutoUpdate>0) {
       PRINTF(L_SYS_TPSAU,"TPS AU triggered");
       if(!cSoftCAM::TriggerHook(cardnum,HOOK_TPSAU)) {

diff --git a/systems/viaccess/tps.h b/systems/viaccess/tps.h
index 57bfc84c9d64cec4635b887da24f31dfa0ae915d..a452990eb9e11bf1a334c6306657b4e06a16c46e 100644 (file)
--- a/systems/viaccess/tps.h
+++ b/systems/viaccess/tps.h
@@ -139,5 +139,6 @@ public:
   };
 
 extern cTpsKeys tpskeys;
+extern int tpsAuMode;
 
 #endif

diff --git a/systems/viaccess/viaccess.c b/systems/viaccess/viaccess.c
index 0c4c43f38f5742d3b122c1792a2af0b9a4ed5148..76e98a19d3cb749189fbc6fa99d2ef39a241fad4 100644 (file)
--- a/systems/viaccess/viaccess.c
+++ b/systems/viaccess/viaccess.c
@@ -22,6 +22,7 @@
 #include <ctype.h>
 
 #include "system-common.h"
+#include "opts.h"
 #include "misc.h"
 #include "parse.h"
 #include "log-core.h"
@@ -520,6 +521,11 @@ void cSystemViaccess::ProcessEMM(int pid, int caid, unsigned char *data)
 
 // -- cSystemLinkViaccess ------------------------------------------------------
 
+static const char *tpsau[] = {
+  trNOOP("stream"),
+  trNOOP("tps.bin"),
+  };
+
 class cSystemLinkViaccess : public cSystemLink {
 public:
   cSystemLinkViaccess(void);
@@ -532,6 +538,8 @@ static cSystemLinkViaccess staticInit;
 cSystemLinkViaccess::cSystemLinkViaccess(void)
 :cSystemLink(SYSTEM_NAME,SYSTEM_PRI)
 {
+  opts=new cOpts(SYSTEM_NAME,1);
+  opts->Add(new cOptSel("TpsAU",trNOOP("Viaccess: TPS updates from"),&tpsAuMode,sizeof(tpsau)/sizeof(char *),tpsau));
   Feature.NeedsKeyFile();
 }