From 05bd062f792b1c4d1b7b4222c84d239584a1dc60 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Thu, 6 Jan 2005 14:56:08 +0100
Subject: Fixed handling preferred audio language when switching via Channels
menu to the same channel
---
device.c | 3 ++-
dvbdevice.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/device.c b/device.c
index bc551b65..e217ceb3 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.68 2005/01/06 13:30:30 kls Exp $
+ * $Id: device.c 1.69 2005/01/06 14:56:08 kls Exp $
*/
#include "device.h"
@@ -543,6 +543,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
if (LiveView && IsPrimaryDevice()) {
// Set the available audio tracks:
ClrAvailableTracks();
+ currentAudioTrack = ttAudioFirst;
for (int i = 0; i < MAXAPIDS; i++) {
SetAvailableTrack(ttAudio, i, Channel->Apid(i), Channel->Alang(i));
SetAvailableTrack(ttDolby, i, Channel->Dpid(i), Channel->Dlang(i));
diff --git a/dvbdevice.c b/dvbdevice.c
index 53d1e8b0..e2532a03 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 1.110 2005/01/06 13:32:41 kls Exp $
+ * $Id: dvbdevice.c 1.111 2005/01/06 14:48:45 kls Exp $
*/
#include "dvbdevice.h"
@@ -801,7 +801,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
// PID settings:
if (TurnOnLivePIDs) {
- if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid(0), ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+ if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid(0), ptAudio))) {
esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
return false;
}
--
cgit v1.2.3