r1139 - vdr/vdr/trunk/debian/patches

[Thomas Günther]

Author: tom-guest
Date: 2005-09-01 20:32:30 +0000 (Thu, 01 Sep 2005)
New Revision: 1139

Modified:
   vdr/vdr/trunk/debian/patches/22_vdr-playerepg.dpatch
Log:
Adapted 22_vdr-playerepg.dpatch to vdr-1.3.31

Modified: vdr/vdr/trunk/debian/patches/22_vdr-playerepg.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/22_vdr-playerepg.dpatch	2005-09-01 19:27:57 UTC (rev 1138)
+++ vdr/vdr/trunk/debian/patches/22_vdr-playerepg.dpatch	2005-09-01 20:32:30 UTC (rev 1139)
@@ -3,8 +3,11 @@
 ## 22_vdr-playerepg.dpatch by Stefan Hülswitt <s.huelswitt at gmx.de>
 ## http://vdrportal.de/board/thread.php?postid=348701#post348701
 ##
+## Thomas Günther <tom at toms-cafe.de>:
+##   - adapted to vdr-1.3.31
+##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes problems with live background and EPG scan enabled.
+## DP: Fixes mp3 plugin problems with live background and EPG scan enabled.
 
 @DPATCH@
 diff -u vdr-1.3.29-orig/device.c vdr-current-1.3.29/device.c
@@ -34,15 +37,15 @@
         ///< Returns true if we are currently replaying.
    void StopReplay(void);
         ///< Stops the current replay session (if any).
-diff -u vdr-1.3.29-orig/eitscan.c vdr-current-1.3.29/eitscan.c
---- vdr-1.3.29-orig/eitscan.c	2005-08-07 13:29:54.000000000 +0200
-+++ vdr-current-1.3.29/eitscan.c	2005-08-24 19:17:22.000000000 +0200
-@@ -150,7 +165,7 @@
+diff -u vdr-1.3.31-orig/eitscan.c vdr-current-1.3.31/eitscan.c
+--- vdr-1.3.31-orig/eitscan.c	2005-08-28 18:46:14.000000000 +0200
++++ vdr-current-1.3.31/eitscan.c	2005-09-01 01:17:13.000000000 +0200
+@@ -150,7 +150,7 @@
                           if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
                              if (Device->ProvidesTransponder(Channel)) {
                                 if (!Device->Receiving()) {
--                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying();
-+                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying(true);
+-                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying() && cTransferControl::ReceiverDevice() != cDevice::PrimaryDevice();
++                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying(true) && cTransferControl::ReceiverDevice() != cDevice::PrimaryDevice();
                                    if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && (IsPrimaryDeviceReplaying || now - lastActivity > Setup.EPGScanTimeout * 3600))) {
                                       if (!IsPrimaryDeviceReplaying && Device == cDevice::ActualDevice() && !currentChannel) {
                                          if (cTransferControl::ReceiverDevice())