cAudio::Play() now also gets the 0xC0...0xDF audio

3 files changed, 12 insertions, 6 deletions

diff --git a/HISTORY b/HISTORY
index 1f3efe27..3b132150 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3390,8 +3390,9 @@ Video Disk Recorder Revision History
 - Forcing a new resync after a call to cRemux::Clear() (suggested by Marco Schlüßler).
 - The cAudio::Play() function now has an additional parameter 'uchar Id' which tells
   the function the substream id of the given audio packet, so that a plugin can
-  take the right action for the various kinds if audio data (based on suggestions
-  by Werner Fink and Macro Schlüßler).
+  take the right action for the various kinds if audio data - which now also includes
+  "normal" audio with ids 0xC0...0xDF (based on suggestions by Werner Fink and Macro
+  Schlüßler).
 - Removed the "Cleared/PlayPes(NULL, 0)" handling from cTransfer::Action(), since this
   is now done when attaching the player to the device (thanks to Marco Schlüßler).
 - Making sure the buffer reserve in cTransfer::Action() is re-established after
diff --git a/PLUGINS.html b/PLUGINS.html
index 49f5ff72..67b96d93 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -81,7 +81,9 @@ structures and allows it to hook itself into specific areas to perform special a
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <li><a href="#Devices">Devices</a>
-<li><a href="#Dolby Digital">Dolby Digital</a>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Audio">Audio</a>
+<!--X1.3.21--></td></tr></table>
 <li><a href="#Remote Control">Remote Control</a>
 </ul>
 </ul>
@@ -1656,7 +1658,7 @@ shut down (delete) all devices when the program terminates. It is therefore
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<a name="Dolby Digital"><hr><h2>Dolby Digital</h2>
+<a name="Audio"><hr><h2>Audio</h2>
 
 <center><i><b>"The stereo effect may only be experienced if stereo equipment is used!"</b></i></center><p>
 
diff --git a/device.c b/device.c
index 4eb859ea..f270b5a4 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.91 2005/02/12 16:29:49 kls Exp $
+ * $Id: device.c 1.92 2005/02/13 09:51:48 kls Exp $
  */
 
 #include "device.h"
@@ -883,8 +883,11 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                break;
           case 0xC0 ... 0xDF: // audio
                SetAvailableTrack(ttAudio, c - 0xC0, c);
-               if (!VideoOnly && c == availableTracks[currentAudioTrack].id)
+               if (!VideoOnly && c == availableTracks[currentAudioTrack].id) {
                   w = PlayAudio(Start, d);
+                  if (FirstLoop)
+                     Audios.PlayAudio(Data, Length, c);
+                  }
                break;
           case 0xBD: { // private stream 1
                int PayloadOffset = Data[8] + 9;