diff -Nru vdr-1.6.0/config.c vdr-1.6.0-dd-record-option/config.c --- vdr-1.6.0/config.c 2008-04-07 20:59:19.000000000 +0200 +++ vdr-1.6.0-dd-record-option/config.c 2008-04-07 21:10:59.000000000 +0200 @@ -259,6 +259,7 @@ VideoDisplayFormat = 1; VideoFormat = 0; UpdateChannels = 5; + RecordDolbyDigital = 1; UseDolbyDigital = 1; ChannelInfoPos = 0; ChannelInfoTime = 5; @@ -437,6 +438,7 @@ else if (!strcasecmp(Name, "VideoDisplayFormat")) VideoDisplayFormat = atoi(Value); else if (!strcasecmp(Name, "VideoFormat")) VideoFormat = atoi(Value); else if (!strcasecmp(Name, "UpdateChannels")) UpdateChannels = atoi(Value); + else if (!strcasecmp(Name, "RecordDolbyDigital")) RecordDolbyDigital = atoi(Value); else if (!strcasecmp(Name, "UseDolbyDigital")) UseDolbyDigital = atoi(Value); else if (!strcasecmp(Name, "ChannelInfoPos")) ChannelInfoPos = atoi(Value); else if (!strcasecmp(Name, "ChannelInfoTime")) ChannelInfoTime = atoi(Value); @@ -525,6 +527,7 @@ Store("VideoDisplayFormat", VideoDisplayFormat); Store("VideoFormat", VideoFormat); Store("UpdateChannels", UpdateChannels); + Store("RecordDolbyDigital", RecordDolbyDigital); Store("UseDolbyDigital", UseDolbyDigital); Store("ChannelInfoPos", ChannelInfoPos); Store("ChannelInfoTime", ChannelInfoTime); diff -Nru vdr-1.6.0/config.h vdr-1.6.0-dd-record-option/config.h --- vdr-1.6.0/config.h 2008-04-07 21:07:56.000000000 +0200 +++ vdr-1.6.0-dd-record-option/config.h 2008-04-07 21:11:08.000000000 +0200 @@ -245,6 +245,7 @@ int VideoDisplayFormat; int VideoFormat; int UpdateChannels; + int RecordDolbyDigital; int UseDolbyDigital; int ChannelInfoPos; int ChannelInfoTime; diff -Nru vdr-1.6.0/menu.c vdr-1.6.0-dd-record-option/menu.c --- vdr-1.6.0/menu.c 2008-04-07 21:07:56.000000000 +0200 +++ vdr-1.6.0-dd-record-option/menu.c 2008-04-07 21:11:38.000000000 +0200 @@ -2691,7 +2691,8 @@ Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"), &data.VideoFormat, "4:3", "16:9")); if (data.VideoFormat == 0) Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts)); - Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"), &data.UseDolbyDigital)); + Add(new cMenuEditBoolItem(tr("Setup.DVB$Record Dolby Digital"), &data.RecordDolbyDigital)); + Add(new cMenuEditBoolItem(tr("Setup.DVB$Replay Dolby Digital"), &data.UseDolbyDigital)); Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"), &data.UpdateChannels, 6, updateChannelsTexts)); Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"), &numAudioLanguages, 0, I18nLanguages()->Size())); for (int i = 0; i < numAudioLanguages; i++) diff -Nru vdr-1.6.0/po/de_DE.po vdr-1.6.0-dd-record-option/po/de_DE.po --- vdr-1.6.0/po/de_DE.po 2008-04-07 20:59:19.000000000 +0200 +++ vdr-1.6.0-dd-record-option/po/de_DE.po 2008-04-07 21:12:06.000000000 +0200 @@ -620,8 +620,11 @@ msgid "Setup.DVB$Video display format" msgstr "Video-Anzeigeformat" -msgid "Setup.DVB$Use Dolby Digital" -msgstr "Dolby-Digital-Ton benutzen" +msgid "Setup.DVB$Record Dolby Digital" +msgstr "Dolby-Digital-Ton aufzeichnen" + +msgid "Setup.DVB$Replay Dolby Digital" +msgstr "Dolby-Digital-Ton wiedergeben" msgid "Setup.DVB$Update channels" msgstr "Kanäle aktualisieren" diff -Nru vdr-1.6.0/po/fr_FR.po vdr-1.6.0-dd-record-option/po/fr_FR.po --- vdr-1.6.0/po/fr_FR.po 2008-04-07 20:59:19.000000000 +0200 +++ vdr-1.6.0-dd-record-option/po/fr_FR.po 2008-04-07 21:12:28.000000000 +0200 @@ -626,8 +626,11 @@ msgid "Setup.DVB$Video display format" msgstr "Format d'affichage" -msgid "Setup.DVB$Use Dolby Digital" -msgstr "Utiliser le Dolby Digital" +msgid "Setup.DVB$Record Dolby Digital" +msgstr "Enregistrer le Dolby Digital" + +msgid "Setup.DVB$Replay Dolby Digital" +msgstr "Lire le Dolby Digital" msgid "Setup.DVB$Update channels" msgstr "Mettre à jour les chaînes" diff -Nru vdr-1.6.0/recorder.c vdr-1.6.0-dd-record-option/recorder.c --- vdr-1.6.0/recorder.c 2008-04-07 20:59:21.000000000 +0200 +++ vdr-1.6.0-dd-record-option/recorder.c 2008-04-07 21:13:16.000000000 +0200 @@ -142,7 +142,7 @@ // --- cRecorder ------------------------------------------------------------- cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids, cTtxtSubsRecorderBase *tsr) -:cReceiver(ChannelID, Priority, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids) +:cReceiver(ChannelID, Priority, VPid, APids, Setup.RecordDolbyDigital ? DPids : NULL, SPids) ,cThread("recording") { // Make sure the disk is up and running: @@ -151,7 +151,7 @@ ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE * 2, true, "Recorder"); ringBuffer->SetTimeouts(0, 100); - remux = new cRemux(VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids, true); + remux = new cRemux(VPid, APids, Setup.RecordDolbyDigital ? DPids : NULL, SPids, true); writer = new cFileWriter(FileName, remux, tsr); }