added option to set TS buffer size

diff --git a/device.c b/device.c
index fe10d5ecc5bab68b94822bd744f7001f4bfd4967..2c1a5ec669a87f2adafb0a84f49521f88b9a8603 100644 (file)
--- a/device.c
+++ b/device.c
@@ -1591,7 +1591,7 @@ bool cScDevice::OpenDvr(void)
   fd_dvr=cScDevices::DvbOpen(DEV_DVB_DVR,DVB_DEV_SPEC,O_RDONLY|O_NONBLOCK,true);
   if(fd_dvr>=0) {
     tsMutex.Lock();
-    tsBuffer=new cDeCsaTSBuffer(fd_dvr,MEGABYTE(4),CardIndex()+1,decsa,ScActive());
+    tsBuffer=new cDeCsaTSBuffer(fd_dvr,MEGABYTE(ScSetup.DeCsaTsBuffSize),CardIndex()+1,decsa,ScActive());
     tsMutex.Unlock();
     }
   return fd_dvr>=0;

diff --git a/po/de_DE.po b/po/de_DE.po
index 77030a9eb6b8ac5af2a2756cb520d9e6890b515e..48bf38cf8401ba2b1465520b9cfb40eb1aae4ba0 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr "Lokale Systeme bevorzugen"
 msgid "ECM cache"
 msgstr "ECM Zwischenspeicher"
 
+msgid "TS buffer size MB"
+msgstr "TS Puffergröße MB"
+
 msgid "Active on DVB card"
 msgstr "Aktiv auf DVB Karte"
 

diff --git a/po/fi_FI.po b/po/fi_FI.po
index 6d7e1c77a20cf809868dc223880b7b24d420e718..16f4ad559ce55a586d0c2c025afe9116680ebfef 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2008-11-19 13:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr "Suosi paikallista salauksenpurkua"
 msgid "ECM cache"
 msgstr "ECM-välimuisti"
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "Aktiivinen DVB-kortilla"
 

diff --git a/po/fr_FR.po b/po/fr_FR.po
index 89011d963025bbc4d639637b675f8b48f2c35364..34ba34470d00485008362c021b602ff3fb470a4c 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr "Pr
 msgid "ECM cache"
 msgstr ""
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "Actif sur la carte DVB"
 

diff --git a/po/hu_HU.po b/po/hu_HU.po
index 56d8506ff96640ce7c09d333d5446bb6c9cdbad1..269aed9ea5db29242cb0ba686195d833747c1f69 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2009-05-17 11:09+0800\n"
 "Last-Translator: jv\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr "Helyi rendszerek elonyben"
 msgid "ECM cache"
 msgstr ""
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "Aktív a következo DVB kártyán"
 

diff --git a/po/it_IT.po b/po/it_IT.po
index 75de5a87f3709b868c2de522a198de858909609b..5e8e1ce7d149a384aa47393b4120c89d6241a82e 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2008-11-19 12:23+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr "Preferisci sistemi locali"
 msgid "ECM cache"
 msgstr "cache ECM"
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "Attiva sulla scheda DVB"
 

diff --git a/po/lt_LT.po b/po/lt_LT.po
index 8df50088c15c6f3dbae0ed7d6cb25504be62e9bf..ff0fcb90047d2bd8484f9017d95492b1c946eec2 100644 (file)
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.10\n"
 "Report-Msgid-Bugs-To: <noone@nowhere.org>\n"
-"POT-Creation-Date: 2010-02-21 11:45+0200\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr "Teikti pirmenybę vietinėm sistemoms"
 msgid "ECM cache"
 msgstr "Laikonoji ECM saugykla (cache)"
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "Palaikymas įjungtas DVB kortoje"
 
@@ -175,14 +178,26 @@ msgstr "Programiškai emuliuojamas dekodavimo modulis"
 msgid "undisclosed key"
 msgstr "nežinomas raktas"
 
-msgid "stream"
-msgstr "srautas"
+msgid "Cardclient: connect immediately"
+msgstr "Programinė kortelė: prisijungti tučtuojau"
 
-msgid "tps.bin"
-msgstr "tps.bin"
+msgid "Nagra: min. ECM processing time"
+msgstr "Nagra: min. ECM apdorojimo laikas"
 
-msgid "Viaccess: TPS updates from"
-msgstr "Viaccess: TPS atnaujinimai imami iš"
+msgid "Nagra2: drop EMM-S packets"
+msgstr "Nagra2: atmesti EMM-S paketus"
+
+msgid "Nagra2: Enable AUXserver"
+msgstr "Nagra2: Įjungti AUXserver'į"
+
+msgid "Nagra2: AUXserver hostname"
+msgstr "Nagra2: AUXserver'io adresas"
+
+msgid "Nagra2: AUXserver port"
+msgstr "Nagra2: AUXserver'io portas"
+
+msgid "Nagra2: AUXserver password"
+msgstr "Nagra2: AUXserver'io slapyvardis"
 
 msgid "don't touch"
 msgstr "neliesti"
@@ -190,11 +205,11 @@ msgstr "neliesti"
 msgid "disable"
 msgstr "išjungti"
 
-msgid "SC-Viaccess: Parental lock"
-msgstr "SC-Viaccess: Tėvų užraktas"
+msgid "SC-Cryptoworks: Parental rating"
+msgstr "SC-Cryptoworks: Tėvų kodo reitingas"
 
-msgid "Cardclient: connect immediately"
-msgstr "Programinė kortelė: prisijungti tučtuojau"
+msgid "SC-Nagra: use T14 Nagra mode"
+msgstr "SC-Nagra: naudoti Nagra T14 ręžimą"
 
 msgid "allow ALL"
 msgstr "leisti VISKĄ"
@@ -211,26 +226,14 @@ msgstr "blokuoti VISUS"
 msgid "SC-Seca: EMM updates"
 msgstr "SC-Seca: EMM atnaujinimai"
 
-msgid "SC-Cryptoworks: Parental rating"
-msgstr "SC-Cryptoworks: Tėvų kodo reitingas"
-
-msgid "Nagra: min. ECM processing time"
-msgstr "Nagra: min. ECM apdorojimo laikas"
-
-msgid "Nagra2: drop EMM-S packets"
-msgstr "Nagra2: atmesti EMM-S paketus"
-
-msgid "Nagra2: Enable AUXserver"
-msgstr "Nagra2: Įjungti AUXserver'į"
-
-msgid "Nagra2: AUXserver hostname"
-msgstr "Nagra2: AUXserver'io adresas"
+msgid "SC-Viaccess: Parental lock"
+msgstr "SC-Viaccess: Tėvų užraktas"
 
-msgid "Nagra2: AUXserver port"
-msgstr "Nagra2: AUXserver'io portas"
+msgid "stream"
+msgstr "srautas"
 
-msgid "Nagra2: AUXserver password"
-msgstr "Nagra2: AUXserver'io slapyvardis"
+msgid "tps.bin"
+msgstr "tps.bin"
 
-msgid "SC-Nagra: use T14 Nagra mode"
-msgstr "SC-Nagra: naudoti Nagra T14 ręžimą"
+msgid "Viaccess: TPS updates from"
+msgstr "Viaccess: TPS atnaujinimai imami iš"

diff --git a/po/nl_NL.po b/po/nl_NL.po
index 0bec0c80d99a51e26acb1dca08b56938d5c7bcb8..023df14fd2dba0e1b84fd2b6b552d439e44fb2f6 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr ""
 msgid "ECM cache"
 msgstr ""
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "Actief op DVB kaart"
 

diff --git a/po/pl_PL.po b/po/pl_PL.po
index dbd3afb9ea84324d32eefc69a4657df6ac906d0d..38efa532e1aa412674365fef4784419934399eeb 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr ""
 msgid "ECM cache"
 msgstr ""
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "Aktywny na karcie DVB"
 

diff --git a/po/ru_RU.po b/po/ru_RU.po
index 6e2ab430c3779aee88e80f1d2ed22b6ddbc31485..25e7d1b6e92955dd3461215ae7fe4ca0e6b93c93 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2009-05-14 19:33+0100\n"
 "Last-Translator: somebody\n"
 "Language-Team: ru\n"
@@ -149,6 +149,9 @@ msgstr "
 msgid "ECM cache"
 msgstr "ECM Úíè"
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "°ÚâØÒÝëÙ ÝÐ ßÛÐâÕ DVB"
 

diff --git a/po/sv_SE.po b/po/sv_SE.po
index e3d6dfd6036e8a93cb3c70a2cde14c58eb6b0ce3..a683ff102b5f5d7453b0f11cf988880d53177d29 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: 2009-12-21 08:38-0500\n"
+"POT-Creation-Date: 2010-12-12 13:24+0100\n"
 "PO-Revision-Date: 2007-08-27 12:45+0200\n"
 "Last-Translator: somebody\n"
 "Language-Team: somebody\n"
@@ -148,6 +148,9 @@ msgstr ""
 msgid "ECM cache"
 msgstr ""
 
+msgid "TS buffer size MB"
+msgstr ""
+
 msgid "Active on DVB card"
 msgstr "Aktiv på DVB-kort"
 

diff --git a/sc.c b/sc.c
index 82960bf08986062e64ac85ee4a75a628d42ae32b..d0678a2b5a283ac36bc14eacbd407689ba7c9c65 100644 (file)
--- a/sc.c
+++ b/sc.c
@@ -945,6 +945,7 @@ cScSetup::cScSetup(void)
   PrestartAU=0;
   SuperKeys=0;
   EcmCache=0;
+  DeCsaTsBuffSize=4;
 }
 
 void cScSetup::Check(void)
@@ -963,6 +964,7 @@ void cScSetup::Check(void)
   PRINTF(L_CORE_LOAD,"** Concurrent FF recordings are %sallowed",ConcurrentFF?"":"NOT ");
   PRINTF(L_CORE_LOAD,"** %sorce transfermode with digital audio",ForceTransfer?"F":"DON'T f");
   PRINTF(L_CORE_LOAD,"** ECM cache is set to %s",EcmCache ? (EcmCache==1?"READ-ONLY":"DISABLED"):"enabled");
+  PRINTF(L_CORE_LOAD,"** TsBufferSize is %d MB",DeCsaTsBuffSize);
   LBSTART(L_CORE_LOAD);
   LBPUT("** ScCaps are"); for(int i=0; i<MAXSCCAPS ; i++) LBPUT(" %d",ScCaps[i]);
   LBEND();
@@ -1247,7 +1249,7 @@ cScPlugin::cScPlugin(void)
   static const char *logg[] = { trNOOP("off"),trNOOP("active CAIDs"),trNOOP("all CAIDs") };
   static const char *skey[] = { trNOOP("comment out"),trNOOP("remove") };
   static const char *ecache[] = { trNOOP("enabled"),trNOOP("read-only"),trNOOP("off") };
-  ScOpts=new cOpts(0,9);
+  ScOpts=new cOpts(0,10);
   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));
@@ -1255,6 +1257,7 @@ cScPlugin::cScPlugin(void)
   ScOpts->Add(new cOptBool ("ForceTranfer" ,trNOOP("Force TransferMode")   ,&ScSetup.ForceTransfer));
   ScOpts->Add(new cOptBool ("LocalPriority",trNOOP("Prefer local systems") ,&ScSetup.LocalPriority));
   ScOpts->Add(new cOptSel  ("EcmCache"     ,trNOOP("ECM cache")            ,&ScSetup.EcmCache,3,ecache));
+  ScOpts->Add(new cOptInt  ("DeCsaTsBuffSize",trNOOP("TS buffer size MB")  ,&ScSetup.DeCsaTsBuffSize,4,15));
   ScOpts->Add(new cOptMInt ("ScCaps"       ,trNOOP("Active on DVB card")   , ScSetup.ScCaps,MAXSCCAPS,0));
   LogOpts=new cOpts(0,6);
   LogOpts->Add(new cOptBool ("LogConsole"  ,trNOOP("Log to console")      ,&logcfg.logCon));

diff --git a/scsetup.h b/scsetup.h
index 5e12c0b1468b660306050c1997eb64ed3f8f4170..4b0e88226ba34071af5efd9d2bb8b12baaa58ef9 100644 (file)
--- a/scsetup.h
+++ b/scsetup.h
@@ -34,6 +34,7 @@ public:
   int PrestartAU;
   int SuperKeys;
   int EcmCache;
+  int DeCsaTsBuffSize;
 public:
   cScSetup(void);
   void Check(void);