add setup option to toggle comment out or remove of superseded keys in keyfile

diff --git a/data.c b/data.c
index 299b8d3bc0c16e6467fe1cf698b8f16bc1872db5..f94c84a4e98e85c574f2e2ef6b8b34516213d8ca 100644 (file)
--- a/data.c
+++ b/data.c
@@ -274,6 +274,13 @@ bool cStructLoader::CheckUnmodified(void)
   return true;
 }
 
+bool cStructLoader::CheckDoSave(void)
+{
+  return !SL_TSTFLAG(SL_DISABLED) && SL_TSTFLAG(SL_READWRITE)
+         && !SL_TSTFLAG(SL_NOACCESS) && SL_TSTFLAG(SL_LOADED)
+         && IsModified() && CheckUnmodified();
+}
+
 void cStructLoader::LoadFinished(void)
 {
   SL_CLRFLAG(SL_SHUTUP);
@@ -385,13 +392,6 @@ void cStructLoader::Purge(void)
     }
 }
 
-bool cStructLoader::CheckDoSave(void)
-{
-  return !SL_TSTFLAG(SL_DISABLED) && SL_TSTFLAG(SL_READWRITE)
-         && !SL_TSTFLAG(SL_NOACCESS) && SL_TSTFLAG(SL_LOADED)
-         && IsModified() && CheckUnmodified();
-}
-
 void cStructLoader::Save(void)
 {
   if(CheckDoSave()) {
@@ -891,7 +891,7 @@ bool cPlainKeys::AddNewKey(cPlainKey *nk, const char *reason)
   for(k=0; (k=FindKeyNoTrig(nk->type,nk->id,nk->keynr,nk->Size(),k)); ) {
     if(nk->CanSupersede()) {
       PRINTF(L_GEN_INFO,"supersedes key: %s",*k->ToString(true));
-      DelItem(k,true);
+      DelItem(k,ScSetup.SuperKeys==0);
       }
     if(!ref) ref=k;
     }

diff --git a/po/de_DE.po b/po/de_DE.po
index 76e4e142bbeb402e3aaf885d194bea035080dc78..77b2e675008da2a6a5e575033ce8ff6cac4f9230 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -115,12 +115,21 @@ msgstr "aktive CAIDs"
 msgid "all CAIDs"
 msgstr "alle CAIDs"
 
+msgid "comment out"
+msgstr "auskommentieren"
+
+msgid "remove"
+msgstr "entfernen"
+
 msgid "Update keys (AU)"
 msgstr "Keys updaten (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr "AU starten bei EPG-Scan"
 
+msgid "Superseded keys"
+msgstr "Veraltete Keys"
+
 msgid "Concurrent FF streams"
 msgstr "Gleichzeitige FF Streams"
 

diff --git a/po/fi_FI.po b/po/fi_FI.po
index 0768b3934bf60e4426d4baec82397d17f0152112..03c800c0320b99e0ab4cb6c35fab3e7038996cb6 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -115,12 +115,21 @@ msgstr "aktiiviset CAID:t"
 msgid "all CAIDs"
 msgstr "kaikki CAID:t"
 
+msgid "comment out"
+msgstr ""
+
+msgid "remove"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Tilausten päivitys (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr "Aloita AU EPG-päivityksessä"
 
+msgid "Superseded keys"
+msgstr ""
+
 msgid "Concurrent FF streams"
 msgstr "Yhtäaikainen salauksenpurku (FF)"
 

diff --git a/po/fr_FR.po b/po/fr_FR.po
index 4e31102209a87079fb3eec9565e00331916f878b..301d52eaf2675917a4bc43c4835924f04a0d50bd 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -115,12 +115,21 @@ msgstr "CAIDs actifs"
 msgid "all CAIDs"
 msgstr "tous les CAIDs"
 
+msgid "comment out"
+msgstr ""
+
+msgid "remove"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Mise à jour des Clés (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr ""
 
+msgid "Superseded keys"
+msgstr ""
+
 msgid "Concurrent FF streams"
 msgstr ""
 

diff --git a/po/hu_HU.po b/po/hu_HU.po
index 7b76ea32d6e92b97eb27f70a3b8b53a433d2e66f..22994eeb657729a9b92d4b8ac5f951ecc1bb6b73 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2007-11-01 16:45+0200\n"
 "Last-Translator: jv\n"
 "Language-Team: somebody\n"
@@ -115,12 +115,21 @@ msgstr "aktív CAIDok"
 msgid "all CAIDs"
 msgstr "minden CAID"
 
+msgid "comment out"
+msgstr ""
+
+msgid "remove"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Kulcsok automatikus frissítése (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr ""
 
+msgid "Superseded keys"
+msgstr ""
+
 msgid "Concurrent FF streams"
 msgstr "Párhuzamos FF streamek"
 

diff --git a/po/it_IT.po b/po/it_IT.po
index d0ca6ebe555286f368b52c581980bd75553559fe..7da4f972158fcb434672d7860f97eb59d80d8005 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -115,12 +115,21 @@ msgstr "CAIDs attivi"
 msgid "all CAIDs"
 msgstr "tutti i CAIDs"
 
+msgid "comment out"
+msgstr ""
+
+msgid "remove"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Aggiornamento chiavi (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr "Avvia AU con la scansione EPG"
 
+msgid "Superseded keys"
+msgstr ""
+
 msgid "Concurrent FF streams"
 msgstr "Flussi simultanei per scheda FF"
 

diff --git a/po/nl_NL.po b/po/nl_NL.po
index eb9e6b8d1d182cec40bc55bff43ac109416fc93a..b8d74a3850e987fca3c8af7ad1e4633cbe436bde 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -115,12 +115,21 @@ msgstr "actieve CAIDS"
 msgid "all CAIDs"
 msgstr "alle CAIDs"
 
+msgid "comment out"
+msgstr ""
+
+msgid "remove"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Keys updaten (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr ""
 
+msgid "Superseded keys"
+msgstr ""
+
 msgid "Concurrent FF streams"
 msgstr ""
 

diff --git a/po/pl_PL.po b/po/pl_PL.po
index 709c7286563e5d17567923ccee354766dc5acf5c..c50a644a216e48bde6e98f792fdb54bfda4c2d14 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -115,12 +115,21 @@ msgstr "aktywne CAID"
 msgid "all CAIDs"
 msgstr "wszystkie CAID"
 
+msgid "comment out"
+msgstr ""
+
+msgid "remove"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Aktualizuj klucze (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr ""
 
+msgid "Superseded keys"
+msgstr ""
+
 msgid "Concurrent FF streams"
 msgstr ""
 

diff --git a/po/ru_RU.po b/po/ru_RU.po
index f370e5f3283098eb8779194d60ce3ff47872e48a..a40e7a0be3a26e32ac6fc333a37bf7c9b6f184d5 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2008-01-03 14:21+0100\n"
 "Last-Translator: somebody\n"
 "Language-Team: ru\n"
@@ -116,12 +116,21 @@ msgstr "
 msgid "all CAIDs"
 msgstr "ÒáÕ CAID"
 
+msgid "comment out"
+msgstr ""
+
+msgid "remove"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "¾ÑÝÞÒÛïâì ÚÛîçØ (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr "ÁâÐàâ ÐÒâÞÞÑÝÞÒÛÕÝØï ßàØ EPG áÚÐÝØàÞÒÐÝØØ"
 
+msgid "Superseded keys"
+msgstr ""
+
 msgid "Concurrent FF streams"
 msgstr "¿ÐàÐÛÛÕÛìÝëÕ ßÞâÞÚØ FF"
 

diff --git a/po/sv_SE.po b/po/sv_SE.po
index e424901731e6b90e5acba86358f67746995dc0d5..21376e8431651ed8db1b6b5558edb2e3ec6f2c1a 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-07 22:10+0100\n"
+"POT-Creation-Date: 2008-01-18 18:31+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -115,12 +115,21 @@ msgstr "aktiva CAID"
 msgid "all CAIDs"
 msgstr "alla CAID"
 
+msgid "comment out"
+msgstr ""
+
+msgid "remove"
+msgstr ""
+
 msgid "Update keys (AU)"
 msgstr "Nyckeluppdatering (AU)"
 
 msgid "Start AU on EPG scan"
 msgstr ""
 
+msgid "Superseded keys"
+msgstr ""
+
 msgid "Concurrent FF streams"
 msgstr ""
 

diff --git a/sc.c b/sc.c
index 793ce723666767858d2e033f8ca886d14808d60b..815ccf041eb0c9a5104bdcb435b2341a77fbc888 100644 (file)
--- a/sc.c
+++ b/sc.c
@@ -944,15 +944,16 @@ cScSetup ScSetup;
 
 cScSetup::cScSetup(void)
 {
-  AutoUpdate = 1;
+  AutoUpdate=1;
   memset(ScCaps,0,sizeof(ScCaps));
-  ScCaps[0] = 1;
-  ScCaps[1] = 2;
-  ConcurrentFF = 0;
+  ScCaps[0]=1;
+  ScCaps[1]=2;
+  ConcurrentFF=0;
   memset(CaIgnore,0,sizeof(CaIgnore));
-  LocalPriority = 0;
-  ForceTransfer = 1;
-  PrestartAU = 0;
+  LocalPriority=0;
+  ForceTransfer=1;
+  PrestartAU=0;
+  SuperKeys=0;
 }
 
 void cScSetup::Check(void)
@@ -1203,9 +1204,11 @@ public:
 cScPlugin::cScPlugin(void)
 {
   static const char *logg[] = { trNOOP("off"),trNOOP("active CAIDs"),trNOOP("all CAIDs") };
-  ScOpts=new cOpts(0,7);
+  static const char *skey[] = { trNOOP("comment out"),trNOOP("remove") };
+  ScOpts=new cOpts(0,8);
   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));
   ScOpts->Add(new cOptBool ("ConcurrentFF" ,trNOOP("Concurrent FF streams"),&ScSetup.ConcurrentFF));
   ScOpts->Add(new cOptBool ("ForceTranfer" ,trNOOP("Force TransferMode")   ,&ScSetup.ForceTransfer));
   ScOpts->Add(new cOptBool ("LocalPriority",trNOOP("Prefer local systems") ,&ScSetup.LocalPriority));

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