From ed456d44d42d01698d8dcaa70a570b7d448e9a73 Mon Sep 17 00:00:00 2001 From: leslie Date: Tue, 12 Aug 2008 07:54:51 +0800 Subject: [PATCH] viaccess: add TPS AU source switch option --- po/de_DE.po | 11 ++++++++++- po/fi_FI.po | 11 ++++++++++- po/fr_FR.po | 11 ++++++++++- po/hu_HU.po | 11 ++++++++++- po/it_IT.po | 11 ++++++++++- po/nl_NL.po | 11 ++++++++++- po/pl_PL.po | 11 ++++++++++- po/ru_RU.po | 11 ++++++++++- po/sv_SE.po | 11 ++++++++++- systems/viaccess/tps.c | 6 +++++- systems/viaccess/tps.h | 1 + systems/viaccess/viaccess.c | 8 ++++++++ 12 files changed, 104 insertions(+), 10 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 77b2e67..03f2529 100644 --- 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: \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 9656dad..613c727 100644 --- 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: \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 3d8bb41..16f362d 100644 --- 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: \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 22994ee..ab3e0c7 100644 --- 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: \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 5dd4773..5440752 100644 --- 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: \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 b8d74a3..914b649 100644 --- 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: \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 c50a644..cfbcfde 100644 --- 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: \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 588ef22..86dab96 100644 --- 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: \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 21376e8..51e877d 100644 --- 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: \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 084dc2f..31b2ea5 100644 --- 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("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 57bfc84..a452990 100644 --- 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 0c4c43f..76e98a1 100644 --- a/systems/viaccess/viaccess.c +++ b/systems/viaccess/viaccess.c @@ -22,6 +22,7 @@ #include #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(); } -- 2.39.5