summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY5
-rw-r--r--config.h6
-rw-r--r--dvbdevice.c7
3 files changed, 14 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 24b23c97..98d0c157 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3962,3 +3962,8 @@ Video Disk Recorder Revision History
- The SVDRP command MESG uses the new message queueing facility, so MESG
commands may now be executed at any time, and the message will be displayed
(no more "pending message").
+
+2005-12-03: Version 1.3.38
+
+- Fixed handling second audio and Dolby Digital PIDs for encrypted channels
+ (was broken in version 1.3.37).
diff --git a/config.h b/config.h
index 733b959a..92dd048c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.235 2005/11/11 13:22:02 kls Exp $
+ * $Id: config.h 1.236 2005/12/03 11:50:08 kls Exp $
*/
#ifndef __CONFIG_H
@@ -19,8 +19,8 @@
#include "i18n.h"
#include "tools.h"
-#define VDRVERSION "1.3.37"
-#define VDRVERSNUM 10337 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.3.38"
+#define VDRVERSNUM 10338 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99
#define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 30ce1e4a..43e55389 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.138 2005/11/26 13:23:11 kls Exp $
+ * $Id: dvbdevice.c 1.139 2005/11/29 17:18:04 kls Exp $
*/
#include "dvbdevice.h"
@@ -825,6 +825,11 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
return false;
}
+ //XXX quick workaround for additional live audio PIDs:
+ if (ciHandler) {
+ ciHandler->SetPid(Channel->Apid(1), true);
+ ciHandler->SetPid(Channel->Dpid(0), true);
+ }
if (IsPrimaryDevice())
AddPid(Channel->Tpid(), ptTeletext);
CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schlüßler <marco@lordzodiac.de> this works