From ca4da1845c678afcf886b3dbeb3ebfc414a5c691 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 20 Feb 2005 14:07:52 +0100
Subject: [PATCH] Changed MAXDPIDS to 16 (8xAC3 + 8xDTS)

---
 CONTRIBUTORS | 1 +
 HISTORY      | 1 +
 channels.h   | 4 ++--
 device.h     | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cb809786..5f327ddf 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -274,6 +274,7 @@ Werner Fink <werner@suse.de>
  for pointing out that pesAssembler->Reset() needs to be called between subsequent
  Transfer Modes
  for suggestions that led to the addition of the 'Id' parameter to cAudio::Play().
+ for pointing out that MAXDPIDS needs to be to 16 (8xAC3 + 8xDTS)
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
diff --git a/HISTORY b/HISTORY
index 07aa9e86..0873d7d2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3432,3 +3432,4 @@ Video Disk Recorder Revision History
 - Added support for setting the video display mode (thanks to Marco Schlüßler).
 - The new setup option "DVB/Video display format" can be used to define which display
   format to use for playing wide screen video on a 4:3 tv set.
+- Changed MAXDPIDS to 16 (8xAC3 + 8xDTS) (thanks to Werner Fink for pointing this out).
diff --git a/channels.h b/channels.h
index 472003f4..e94be176 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.25 2005/01/16 13:46:41 kls Exp $
+ * $Id: channels.h 1.26 2005/02/20 14:05:24 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -31,7 +31,7 @@
 #define CHANNELSMOD_USER    2
 
 #define MAXAPIDS 32 // audio
-#define MAXDPIDS  8 // dolby
+#define MAXDPIDS 16 // dolby (AC3 + DTS)
 #define MAXSPIDS  8 // subtitles
 #define MAXCAIDS  8 // conditional access
 
diff --git a/device.h b/device.h
index 1e747028..02fa35cc 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.56 2005/02/20 11:30:11 kls Exp $
+ * $Id: device.h 1.57 2005/02/20 14:06:28 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -68,11 +68,11 @@ enum eTrackType { ttNone,
                   ttAudioLast  = ttAudioFirst + 31, // MAXAPIDS - 1
                   ttDolby,
                   ttDolbyFirst = ttDolby,
-                  ttDolbyLast  = ttDolbyFirst + 8, // MAXDPIDS - 1
+                  ttDolbyLast  = ttDolbyFirst + 15, // MAXDPIDS - 1
                   /* future...
                   ttSubtitle,
                   ttSubtitleFirst = ttSubtitle,
-                  ttSubtitleLast  = ttSubtitleFirst + 8, // MAXSPIDS - 1
+                  ttSubtitleLast  = ttSubtitleFirst + 7, // MAXSPIDS - 1
                   */
                   ttMaxTrackTypes
                 };