The option "Setup/DVB/Use Dolby Digital" now only controls whether Dolby Digital tracks appear in the "Audio" menu

This commit is contained in:
Klaus Schmidinger 2010-02-28 14:42:07 +01:00
parent 7506867fbe
commit 9424ab26a6
5 changed files with 11 additions and 12 deletions

View File

@ -6380,3 +6380,6 @@ Video Disk Recorder Revision History
This obsoletes the PLUGINPARAM patch. This obsoletes the PLUGINPARAM patch.
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras). - Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- cSafeFile::Close() now flushes the file (suggested by Stephan Austermühle). - cSafeFile::Close() now flushes the file (suggested by Stephan Austermühle).
- The option "Setup/DVB/Use Dolby Digital" now only controls whether Dolby Digital
tracks appear in the "Audio" menu. Dolby Digital is always recorded.
This obsoletes the DOLBYINREC patch.

8
MANUAL
View File

@ -675,11 +675,9 @@ Version 1.6
4:3. 4:3.
Use Dolby Digital = yes Use Dolby Digital = yes
Turns recording of the Dolby Digital audio channels on Controls whether Dolby Digital tracks appear in the "Audio"
or off. This may be useful if you don't have the equipment menu. This is useful if you don't have the equipment to
to replay Dolby Digital audio and want to save disk space. replay Dolby Digital audio.
If turned off, Dolby Digital tracks also don't appear in the
"Audio" menu.
Update channels = 5 Controls the automatic channel update function. '0' means Update channels = 5 Controls the automatic channel update function. '0' means
no update, '1' will only update channel names, '2' will no update, '1' will only update channel names, '2' will

4
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* *
* $Id: epg.c 2.5 2010/01/08 15:20:28 kls Exp $ * $Id: epg.c 2.6 2010/02/28 14:24:55 kls Exp $
*/ */
#include "epg.h" #include "epg.h"
@ -443,8 +443,6 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
if (components) { if (components) {
for (int i = 0; i < components->NumComponents(); i++) { for (int i = 0; i < components->NumComponents(); i++) {
tComponent *p = components->Component(i); tComponent *p = components->Component(i);
if (!Setup.UseDolbyDigital && p->stream == 0x02 && p->type == 0x05)
continue;
fprintf(f, "%sX %s\n", Prefix, *p->ToString()); fprintf(f, "%sX %s\n", Prefix, *p->ToString());
} }
} }

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: receiver.c 2.2 2010/01/30 10:25:38 kls Exp $ * $Id: receiver.c 2.3 2010/02/28 14:25:32 kls Exp $
*/ */
#include "receiver.h" #include "receiver.h"
@ -81,7 +81,7 @@ bool cReceiver::SetPids(const cChannel *Channel)
return AddPid(Channel->Vpid()) && return AddPid(Channel->Vpid()) &&
(Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) && (Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) &&
AddPids(Channel->Apids()) && AddPids(Channel->Apids()) &&
(!Setup.UseDolbyDigital || AddPids(Channel->Dpids())) && AddPids(Channel->Dpids()) &&
AddPids(Channel->Spids()); AddPids(Channel->Spids());
} }
return true; return true;

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: remux.c 2.41 2010/01/30 10:43:12 kls Exp $ * $Id: remux.c 2.42 2010/02/28 14:42:07 kls Exp $
*/ */
#include "remux.h" #include "remux.h"
@ -601,7 +601,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
dpids[NumDpids] = dpid; dpids[NumDpids] = dpid;
dtypes[NumDpids] = stream.getStreamType(); dtypes[NumDpids] = stream.getStreamType();
strn0cpy(dlangs[NumDpids], lang, sizeof(dlangs[NumDpids])); strn0cpy(dlangs[NumDpids], lang, sizeof(dlangs[NumDpids]));
if (updatePrimaryDevice) if (updatePrimaryDevice && Setup.UseDolbyDigital)
cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang); cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang);
NumDpids++; NumDpids++;
dpids[NumDpids]= 0; dpids[NumDpids]= 0;