frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Added the audio id to the call of PlayAudio() in cDevice::PlayTsAudio()

Browse Source
This commit is contained in:
Klaus Schmidinger 2009-11-22 13:25:16 +01:00
parent d8857154a1
commit c8402639f6
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -2509,3 +2509,6 @@ Rene van den Braken <rene@vandenbraken.name>
Milan Hrala <hrala.milan@gmail.com> Milan Hrala <hrala.milan@gmail.com>
for translating OSD texts to the Slovakian language for translating OSD texts to the Slovakian language
Andreas Schaefers <andreas_schaefers@gmx.de>
for adding the audio id to the call of PlayAudio() in cDevice::PlayTsAudio()

2
HISTORY
View File

@ -6189,3 +6189,5 @@ Video Disk Recorder Revision History
- The cRingBufferLinear::Read() function now returns -1 and sets errno to - The cRingBufferLinear::Read() function now returns -1 and sets errno to
EAGAIN if the buffer is already full. EAGAIN if the buffer is already full.
- Fixed handling DVB subtitles for PES recordings (thanks to Rolf Ahrenberg). - Fixed handling DVB subtitles for PES recordings (thanks to Rolf Ahrenberg).
- Added the audio id to the call of PlayAudio() in cDevice::PlayTsAudio()
(thanks to Andreas Schaefers).

4
device.c
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: device.c 2.25 2009/08/16 10:54:36 kls Exp $ * $Id: device.c 2.26 2009/11/22 13:19:03 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -1309,7 +1309,7 @@ int cDevice::PlayTsAudio(const uchar *Data, int Length)
// Audio PES always has an explicit length and consists of single packets: // Audio PES always has an explicit length and consists of single packets:
int l; int l;
if (const uchar *p = tsToPesAudio.GetPes(l)) { if (const uchar *p = tsToPesAudio.GetPes(l)) {
int w = PlayAudio(p, l, 0); int w = PlayAudio(p, l, p[3]);
if (w <= 0) { if (w <= 0) {
tsToPesAudio.SetRepeatLast(); tsToPesAudio.SetRepeatLast();
return w; return w;

5
device.h
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: device.h 2.15 2009/06/06 11:15:49 kls Exp $ * $Id: device.h 2.16 2009/11/22 13:21:00 kls Exp $
*/ */
#ifndef __DEVICE_H #ifndef __DEVICE_H
@ -514,9 +514,6 @@ protected:
///< Plays the given data block as audio. ///< Plays the given data block as audio.
///< Data points to exactly one complete PES packet of the given Length. ///< Data points to exactly one complete PES packet of the given Length.
///< Id indicates the type of audio data this packet holds. ///< Id indicates the type of audio data this packet holds.
///< Note that as of version 1.7.1 Id is obsolete and may be 0 (in case of
///< TS replay). Plugins that need to know this Id shall read it from the
///< actual PES data (it's the 4th byte).
///< PlayAudio() shall process the packet either as a whole (returning ///< PlayAudio() shall process the packet either as a whole (returning
///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly). ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
///< \return Returns the number of bytes actually taken from Data, or -1 ///< \return Returns the number of bytes actually taken from Data, or -1