New Setup parameter RecordDolbyDigital

7 files changed, 29 insertions, 7 deletions

diff --git a/HISTORY b/HISTORY
index f9674e41..407baf02 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1026,3 +1026,6 @@ Video Disk Recorder Revision History
 - The new SVDRP command PUTE can be used to put EPG data into the EPG list.
   See FORMATS for details about the required data format.
 - Taking the German umlauts 'as is' when compiled with VFAT.
+- The new Setup parameter RecordDolbyDigital can be used to generally turn off
+  recording the Dolby Digital audio channels in case you want to save disk space
+  or don't have the equipment to replay Dolby Digital audio.
diff --git a/MANUAL b/MANUAL
index f8d746ae..f716cc8a 100644
--- a/MANUAL
+++ b/MANUAL
@@ -478,6 +478,10 @@ Video Disk Recorder User's Manual
                          0 = 4:3
                          1 = 16:9
 
+  RecordDolbyDigital = 1 Turns recording of the Dolby Digital audio channels on
+                         or off. This may be useful if you don't have the equipment
+                         to replay Dolby Digital audio and want to save disk space.
+
   ChannelInfoPos = 0     The position of the channel info window in the OSD.
                          0 = bottom
                          1 = top
diff --git a/config.c b/config.c
index 2b363912..8e6cf37a 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.85 2002/02/17 15:38:34 kls Exp $
+ * $Id: config.c 1.86 2002/02/24 11:53:12 kls Exp $
  */
 
 #include "config.h"
@@ -910,6 +910,7 @@ cSetup::cSetup(void)
   UseSubtitle = 1;
   RecordingDirs = 1;
   VideoFormat = VIDEO_FORMAT_4_3;
+  RecordDolbyDigital = 1;
   ChannelInfoPos = 0;
   OSDwidth = 52;
   OSDheight = 18;
@@ -955,6 +956,7 @@ bool cSetup::Parse(char *s)
         else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
         else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
         else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
+        else if (!strcasecmp(Name, "RecordDolbyDigital"))  RecordDolbyDigital = atoi(Value);
         else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
         else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
         else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
@@ -1035,6 +1037,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "UseSubtitle        = %d\n", UseSubtitle);
         fprintf(f, "RecordingDirs      = %d\n", RecordingDirs);
         fprintf(f, "VideoFormat        = %d\n", VideoFormat);
+        fprintf(f, "RecordDolbyDigital = %d\n", RecordDolbyDigital);
         fprintf(f, "ChannelInfoPos     = %d\n", ChannelInfoPos);
         fprintf(f, "OSDwidth           = %d\n", OSDwidth);
         fprintf(f, "OSDheight          = %d\n", OSDheight);
diff --git a/config.h b/config.h
index 393bc77a..48af58e3 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.97 2002/02/17 15:41:44 kls Exp $
+ * $Id: config.h 1.98 2002/02/24 11:53:14 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -330,6 +330,7 @@ public:
   int UseSubtitle;
   int RecordingDirs;
   int VideoFormat;
+  int RecordDolbyDigital;
   int ChannelInfoPos;
   int OSDwidth, OSDheight;
   int OSDMessageTime;
diff --git a/dvbapi.c b/dvbapi.c
index 8392a9b5..813c588f 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.150 2002/02/23 13:11:13 kls Exp $
+ * $Id: dvbapi.c 1.151 2002/02/24 11:53:17 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -3102,9 +3102,9 @@ bool cDvbApi::SetPids(bool ForRecording)
 {
   return SetVpid(vPid,   ForRecording ? DMX_OUT_TS_TAP : DMX_OUT_DECODER) &&
          SetApid1(aPid1, ForRecording ? DMX_OUT_TS_TAP : DMX_OUT_DECODER) &&
-         SetApid2(ForRecording ? aPid2 : 0, DMX_OUT_TS_TAP) &&
+         SetApid2(ForRecording ? aPid2 : 0, DMX_OUT_TS_TAP) && (!Setup.RecordDolbyDigital ||
          SetDpid1(ForRecording ? dPid1 : 0, DMX_OUT_TS_TAP) &&
-         SetDpid2(ForRecording ? dPid2 : 0, DMX_OUT_TS_TAP);
+         SetDpid2(ForRecording ? dPid2 : 0, DMX_OUT_TS_TAP));
 }
 
 eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
diff --git a/i18n.c b/i18n.c
index c3c5221b..49ad5418 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.55 2002/02/17 14:29:13 kls Exp $
+ * $Id: i18n.c 1.56 2002/02/24 11:53:44 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -1076,6 +1076,16 @@ const tPhrase Phrases[] = {
     "TV Format",
     "Kuvamuoto",
   },
+  { "RecordDolbyDigital",
+    "Dolby Digital Ton aufz.",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "ChannelInfoPos",
     "Kanal Info Position",
     "", // TODO
diff --git a/menu.c b/menu.c
index 20bfac1e..bf627637 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.157 2002/02/23 13:55:23 kls Exp $
+ * $Id: menu.c 1.158 2002/02/24 11:54:04 kls Exp $
  */
 
 #include "menu.h"
@@ -1944,6 +1944,7 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditBoolItem(tr("UseSubtitle"),        &data.UseSubtitle));
   Add(new cMenuEditBoolItem(tr("RecordingDirs"),      &data.RecordingDirs));
   Add(new cMenuEditBoolItem(tr("VideoFormat"),        &data.VideoFormat, "4:3", "16:9"));
+  Add(new cMenuEditBoolItem(tr("RecordDolbyDigital"), &data.RecordDolbyDigital));
   Add(new cMenuEditBoolItem(tr("ChannelInfoPos"),     &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditIntItem( tr("OSDwidth"),           &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
   Add(new cMenuEditIntItem( tr("OSDheight"),          &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));