frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed handling audio tracks in cDvbDevice

This commit is contained in:
Klaus Schmidinger 2002-11-01 11:26:28 +01:00
parent 7233a63680
commit 413c2446be
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -1681,3 +1681,4 @@ Video Disk Recorder Revision History
Oliver Endriss). Oliver Endriss).
- Fixed the EPG scanner, which broke 'Transfer Mode' as soon as it kicked in - Fixed the EPG scanner, which broke 'Transfer Mode' as soon as it kicked in
(thanks to Oliver Endriss for reporting this one). (thanks to Oliver Endriss for reporting this one).
- Fixed handling audio tracks in cDvbDevice.

10
dvbdevice.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: dvbdevice.c 1.31 2002/11/01 10:05:27 kls Exp $ * $Id: dvbdevice.c 1.32 2002/11/01 11:24:47 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -616,21 +616,19 @@ int cDvbDevice::NumAudioTracksDevice(void) const
const char **cDvbDevice::GetAudioTracksDevice(int *CurrentTrack) const const char **cDvbDevice::GetAudioTracksDevice(int *CurrentTrack) const
{ {
if (Ca()) if (NumAudioTracksDevice()) {
return NULL; // a Ca recording session blocks switching live audio tracks
if (NumAudioTracks()) {
if (CurrentTrack) if (CurrentTrack)
*CurrentTrack = (pidHandles[ptAudio].pid == aPid1) ? 0 : 1; *CurrentTrack = (pidHandles[ptAudio].pid == aPid1) ? 0 : 1;
static const char *audioTracks1[] = { "Audio 1", NULL }; static const char *audioTracks1[] = { "Audio 1", NULL };
static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL }; static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL };
return NumAudioTracks() > 1 ? audioTracks2 : audioTracks1; return NumAudioTracksDevice() > 1 ? audioTracks2 : audioTracks1;
} }
return NULL; return NULL;
} }
void cDvbDevice::SetAudioTrackDevice(int Index) void cDvbDevice::SetAudioTrackDevice(int Index)
{ {
if (0 <= Index && Index < NumAudioTracks()) { if (0 <= Index && Index < NumAudioTracksDevice()) {
int vpid = pidHandles[ptVideo].pid; // need to turn video PID off/on to restart demux int vpid = pidHandles[ptVideo].pid; // need to turn video PID off/on to restart demux
DelPid(vpid); DelPid(vpid);
DelPid(pidHandles[ptAudio].pid); DelPid(pidHandles[ptAudio].pid);