From edc1440ed8ad50e075dc39de9ac5dee1f552542b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 20 Nov 2004 12:26:01 +0100
Subject: [PATCH] Now setting the VPID before the APID in live mode to avoid
 unnecessary overhead in the firmware

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 2 ++
 dvbdevice.c  | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 12ffc0e0..bf0ce28b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -260,6 +260,8 @@ Werner Fink <werner@suse.de>
  for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
  for suggesting to replace usleep() calls with a pthread_cond_timedwait() based wait
  for suggesting to add more checks and polling when getting frontend events
+ for setting the VPID before the APID in live mode to avoid unnecessary
+ overhead in the firmware
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
diff --git a/HISTORY b/HISTORY
index 0c29d49b..9e85e997 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3155,3 +3155,5 @@ Video Disk Recorder Revision History
 - Fixed some characters in the iso8859-2 font file (thanks to Dino Ravnic).
 - Fixed some errors in the Croatian language texts (thanks to Dino Ravnic).
 - Fixed a possible recursion in cControl::Shutdown() (thanks to Sascha Volkenandt).
+- Now setting the VPID before the APID in live mode to avoid unnecessary
+  overhead in the firmware (thanks to Werner Fink).
diff --git a/dvbdevice.c b/dvbdevice.c
index 2702f953..8780ac53 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.104 2004/11/07 10:27:19 kls Exp $
+ * $Id: dvbdevice.c 1.105 2004/11/20 11:41:37 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -800,7 +800,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   if (TurnOnLivePIDs) {
      aPid1 = Channel->Apid1();
      aPid2 = Channel->Apid2();
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid1(), ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }