add setup option to disable ECM cache

diff --git a/cam.c b/cam.c
index 2d8df90e387fc71b6b3393f14560b288af4942ab..ae385c4195d463340461c50b32bcace57315933e 100644 (file)
--- a/cam.c
+++ b/cam.c
@@ -622,6 +622,7 @@ cEcmCache::cEcmCache(void)
 
 void cEcmCache::New(cEcmInfo *e)
 {
+  if(ScSetup.EcmCache>0) return;
   ListLock(true);
   cEcmData *dat;
   if(!(dat=Exists(e))) {
@@ -654,6 +655,7 @@ int cEcmCache::GetCached(cSimpleList<cEcmInfo> *list, int sid, int Source, int T
 {
   int n=0;
   list->Clear();
+  if(ScSetup.EcmCache>1) return 0;
   ListLock(false);
   for(cEcmData *dat=First(); dat; dat=Next(dat)) {
     if(dat->prgId==sid && dat->source==Source && dat->transponder==Transponder) {
@@ -672,6 +674,7 @@ int cEcmCache::GetCached(cSimpleList<cEcmInfo> *list, int sid, int Source, int T
 
 void cEcmCache::Delete(cEcmInfo *e)
 {
+  if(ScSetup.EcmCache>0) return;
   ListLock(false);
   cEcmData *dat=Exists(e);
   ListUnlock();

diff --git a/po/de_DE.po b/po/de_DE.po
index 03f252933c7a572ca2bfed30587955e24071bd95..3273480a006a2f5bad37531b80c1715aaaa0acab 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -121,6 +121,12 @@ msgstr "auskommentieren"
 msgid "remove"
 msgstr "entfernen"
 
+msgid "enabled"
+msgstr "aktiv"
+
+msgid "read-only"
+msgstr "nur lesen"
+
 msgid "Update keys (AU)"
 msgstr "Keys updaten (AU)"
 
@@ -145,6 +151,9 @@ msgstr "Aktiv auf DVB Karte"
 msgid "Ignore CAID"
 msgstr "Ignoriere CAID"
 
+msgid "ECM cache"
+msgstr "ECM Zwischenspeicher"
+
 msgid "Log to console"
 msgstr "Meldungen auf Konsole"
 

diff --git a/po/fi_FI.po b/po/fi_FI.po
index 613c727eac17d31cbdbc3a29a0bd35d5a3a4b272..41ec3e268975e8724e8634a8badefd018442b77a 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -121,6 +121,12 @@ msgstr "kommentoi"
 msgid "remove"
 msgstr "poista"
 
+msgid "enabled"
+msgstr ""
+
+msgid "read-only"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Tilausten päivitys (AU)"
 
@@ -145,6 +151,9 @@ msgstr "Aktiivinen DVB-kortilla"
 msgid "Ignore CAID"
 msgstr "Jätä huomioimatta CAID"
 
+msgid "ECM cache"
+msgstr ""
+
 msgid "Log to console"
 msgstr "Tulosta konsoliin"
 

diff --git a/po/fr_FR.po b/po/fr_FR.po
index 16f362d8d8e38a38167b193e593987399b3043fd..4909a5133790af665f2d2e5e1ba9fba37e62df63 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -121,6 +121,12 @@ msgstr "commenter"
 msgid "remove"
 msgstr "supprimer"
 
+msgid "enabled"
+msgstr ""
+
+msgid "read-only"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Mise à jour des Clés (AU)"
 
@@ -145,6 +151,9 @@ msgstr "Actif sur la carte DVB"
 msgid "Ignore CAID"
 msgstr "Ignorer les CAID"
 
+msgid "ECM cache"
+msgstr ""
+
 msgid "Log to console"
 msgstr "Logger dans la console"
 

diff --git a/po/hu_HU.po b/po/hu_HU.po
index ab3e0c7d27b511a5a88e8d5adbdc1124efc48c1e..44060c68e37f87e31ef78a889099ba5bef4ba55b 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2007-11-01 16:45+0200\n"
 "Last-Translator: jv\n"
 "Language-Team: somebody\n"
@@ -121,6 +121,12 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
+msgid "enabled"
+msgstr ""
+
+msgid "read-only"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Kulcsok automatikus frissítése (AU)"
 
@@ -145,6 +151,9 @@ msgstr "Aktív a következő DVB kártyán"
 msgid "Ignore CAID"
 msgstr "CAID mellőzése"
 
+msgid "ECM cache"
+msgstr ""
+
 msgid "Log to console"
 msgstr "Naplózás a konzolon"
 

diff --git a/po/it_IT.po b/po/it_IT.po
index 5440752e389bd76bd53e525ee1b1e65044edd96d..50207c4280da0d2c1ff9ad3edd7f9e8721a3f042 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -121,6 +121,12 @@ msgstr "commenta"
 msgid "remove"
 msgstr "rimuovi"
 
+msgid "enabled"
+msgstr ""
+
+msgid "read-only"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Aggiornamento chiavi (AU)"
 
@@ -145,6 +151,9 @@ msgstr "Attiva sulla scheda DVB"
 msgid "Ignore CAID"
 msgstr "Ignora CAID"
 
+msgid "ECM cache"
+msgstr ""
+
 msgid "Log to console"
 msgstr "Log in console"
 

diff --git a/po/nl_NL.po b/po/nl_NL.po
index 914b6499af88e317d8e8cebed2a33698d51b9c6d..d971a913f265ae54cf36b1b1ec06a8d4fec0dfc2 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -121,6 +121,12 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
+msgid "enabled"
+msgstr ""
+
+msgid "read-only"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Keys updaten (AU)"
 
@@ -145,6 +151,9 @@ msgstr "Actief op DVB kaart"
 msgid "Ignore CAID"
 msgstr ""
 
+msgid "ECM cache"
+msgstr ""
+
 msgid "Log to console"
 msgstr ""
 

diff --git a/po/pl_PL.po b/po/pl_PL.po
index cfbcfde2a1d91820dee607df28fd4cc9e22cd63c..2614fbaf9c8f41035951397b17c814139a999fe7 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -121,6 +121,12 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
+msgid "enabled"
+msgstr ""
+
+msgid "read-only"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Aktualizuj klucze (AU)"
 
@@ -145,6 +151,9 @@ msgstr "Aktywny na karcie DVB"
 msgid "Ignore CAID"
 msgstr ""
 
+msgid "ECM cache"
+msgstr ""
+
 msgid "Log to console"
 msgstr ""
 

diff --git a/po/ru_RU.po b/po/ru_RU.po
index 64eb6dcfeb858eb68e313812b74086b781f920e4..b3669bb0426cb86b5b4bf403082a792add321041 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2008-08-18 22:46+0100\n"
 "Last-Translator: somebody\n"
 "Language-Team: ru\n"
@@ -122,6 +122,12 @@ msgstr "
 msgid "remove"
 msgstr "ãÔÐÛØâì"
 
+msgid "enabled"
+msgstr ""
+
+msgid "read-only"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "¾ÑÝÞÒÛïâì ÚÛîçØ (AU)"
 
@@ -146,6 +152,9 @@ msgstr "
 msgid "Ignore CAID"
 msgstr "¸ÓÝÞàØàÞÒÐâì CAID"
 
+msgid "ECM cache"
+msgstr ""
+
 msgid "Log to console"
 msgstr "ÁÞÞÑéÕÝØï Ò ÚÞÝáÞÛÕ"
 
@@ -226,4 +235,3 @@ msgstr "tps.bin"
 
 msgid "Viaccess: TPS updates from"
 msgstr "Viaccess: TPS ÞÑÝÞÒÛÕÝØï Ø×"
-

diff --git a/po/sv_SE.po b/po/sv_SE.po
index 51e877ddf33475cc41b10e921ba17077afe3dd8e..dd41450376bc4026f4134eff61b713dfb1b3f765 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-08-11 19:27-0400\n"
+"POT-Creation-Date: 2008-10-25 23:02-0400\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -121,6 +121,12 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
+msgid "enabled"
+msgstr ""
+
+msgid "read-only"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Nyckeluppdatering (AU)"
 
@@ -145,6 +151,9 @@ msgstr "Aktiv p
 msgid "Ignore CAID"
 msgstr "Ignorera CAID"
 
+msgid "ECM cache"
+msgstr ""
+
 msgid "Log to console"
 msgstr ""
 

diff --git a/sc.c b/sc.c
index e799d178e976d75d770fe42ec0ce162db6dc3979..056ecbbf8f4bc855be8f5d411d43f2a873d58ad3 100644 (file)
--- a/sc.c
+++ b/sc.c
@@ -954,6 +954,7 @@ cScSetup::cScSetup(void)
   ForceTransfer=1;
   PrestartAU=0;
   SuperKeys=0;
+  EcmCache=0;
 }
 
 void cScSetup::Check(void)
@@ -1242,7 +1243,8 @@ cScPlugin::cScPlugin(void)
 {
   static const char *logg[] = { trNOOP("off"),trNOOP("active CAIDs"),trNOOP("all CAIDs") };
   static const char *skey[] = { trNOOP("comment out"),trNOOP("remove") };
-  ScOpts=new cOpts(0,8);
+  static const char *ecache[] = { trNOOP("enabled"),trNOOP("read-only"),trNOOP("off") };
+  ScOpts=new cOpts(0,9);
   ScOpts->Add(new cOptSel  ("AutoUpdate"   ,trNOOP("Update keys (AU)")     ,&ScSetup.AutoUpdate,3,logg));
   ScOpts->Add(new cOptBool ("PrestartAU"   ,trNOOP("Start AU on EPG scan") ,&ScSetup.PrestartAU));
   ScOpts->Add(new cOptSel  ("SuperKeys"    ,trNOOP("Superseded keys")      ,&ScSetup.SuperKeys,2,skey));
@@ -1251,6 +1253,7 @@ cScPlugin::cScPlugin(void)
   ScOpts->Add(new cOptBool ("LocalPriority",trNOOP("Prefer local systems") ,&ScSetup.LocalPriority));
   ScOpts->Add(new cOptMInt ("ScCaps"       ,trNOOP("Active on DVB card")   , ScSetup.ScCaps,MAXSCCAPS,0));
   ScOpts->Add(new cOptMInt ("CaIgnore"     ,trNOOP("Ignore CAID")          , ScSetup.CaIgnore,MAXCAIGN,2));
+  ScOpts->Add(new cOptSel  ("EcmCache"     ,trNOOP("ECM cache")            ,&ScSetup.EcmCache,3,ecache));
   LogOpts=new cOpts(0,6);
   LogOpts->Add(new cOptBool ("LogConsole"  ,trNOOP("Log to console")      ,&logcfg.logCon));
   LogOpts->Add(new cOptBool ("LogFile"     ,trNOOP("Log to file")         ,&logcfg.logFile));

diff --git a/scsetup.h b/scsetup.h
index 8d7c5c6ef45f4a614288a8118b0410338d16953a..d3c9c225ba9c80d473e28e88e4b970f4259177e9 100644 (file)
--- a/scsetup.h
+++ b/scsetup.h
@@ -35,6 +35,7 @@ public:
   int ForceTransfer;
   int PrestartAU;
   int SuperKeys;
+  int EcmCache;
 public:
   cScSetup(void);
   void Check(void);