r4080 - in vdr/vdr-plugin-softplay/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2007-01-18 22:32:31 +0100 (Thu, 18 Jan 2007)
New Revision: 4080

Added:
   vdr/vdr-plugin-softplay/trunk/debian/patches/91_softplay-1.5.0.dpatch
Modified:
   vdr/vdr-plugin-softplay/trunk/debian/changelog
   vdr/vdr-plugin-softplay/trunk/debian/patches/00list
Log:
Added 91_softplay-1.5.0.dpatch

Modified: vdr/vdr-plugin-softplay/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softplay/trunk/debian/changelog	2007-01-18 21:29:25 UTC (rev 4079)
+++ vdr/vdr-plugin-softplay/trunk/debian/changelog	2007-01-18 21:32:31 UTC (rev 4080)
@@ -1,3 +1,10 @@
+vdr-plugin-softplay (0.0.2+cvs20060323-13) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 91_softplay-1.5.0.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 18 Jan 2007 02:29:54 +0100
+
 vdr-plugin-softplay (0.0.2+cvs20060323-12) experimental; urgency=low
 
   [ Thomas Günther ]

Modified: vdr/vdr-plugin-softplay/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softplay/trunk/debian/patches/00list	2007-01-18 21:29:25 UTC (rev 4079)
+++ vdr/vdr-plugin-softplay/trunk/debian/patches/00list	2007-01-18 21:32:31 UTC (rev 4080)
@@ -1,4 +1,5 @@
 02_debian_ffmpeg
 03_Makefile-fPIC-fix
 
-90_APIVERSION.dpatch
+90_APIVERSION
+91_softplay-1.5.0

Added: vdr/vdr-plugin-softplay/trunk/debian/patches/91_softplay-1.5.0.dpatch
===================================================================
--- vdr/vdr-plugin-softplay/trunk/debian/patches/91_softplay-1.5.0.dpatch	2007-01-18 21:29:25 UTC (rev 4079)
+++ vdr/vdr-plugin-softplay/trunk/debian/patches/91_softplay-1.5.0.dpatch	2007-01-18 21:32:31 UTC (rev 4080)
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_softplay-1.5.0.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.0.
+
+ at DPATCH@
+--- softplay-0.0.2+cvs20060323/SoftPlayer.c
++++ softplay-0.0.2+cvs20060323/SoftPlayer.c
+@@ -324,7 +324,11 @@
+                 const cChannel *channel=Channels.GetByNumber(cDevice::CurrentChannel());
+                 Receiver=new cSoftplayReceiver(channel,
+                                 cDevice::PrimaryDevice(),SoftHandles);
++#if APIVERSNUM >= 10500
++                cDevice *receiveDev=cDevice::GetDevice(channel,1,false);
++#else
+                 cDevice *receiveDev=cDevice::GetDevice(channel,1);
++#endif
+                 if (receiveDev)
+                         receiveDev->AttachReceiver(Receiver);
+         };
+@@ -512,13 +516,20 @@
+         delete Receiver;
+         Receiver=NULL;
+                
++#if APIVERSNUM >= 10500
++        cDevice *receiveDev=cDevice::GetDevice(channel, 1, false);
++#else
+         cDevice *receiveDev=cDevice::GetDevice(channel, 1);
+-
++#endif
+         if (!receiveDev) {
+                 printf("Didn't get device!\n");
+                 Skins.Message(mtError, tr("Channel not available!"));
+                 channel = Channels.GetByNumber( currChannelNo );
++#if APIVERSNUM >= 10500
++                receiveDev=cDevice::GetDevice(channel, 1, false);
++#else
+                 receiveDev=cDevice::GetDevice(channel, 1);
++#endif
+                 if (!receiveDev) {
+                         printf("Jetzt bin ich angeschmiert\n");
+                         return;
+--- softplay-0.0.2+cvs20060323/Receiver.c
++++ softplay-0.0.2+cvs20060323/Receiver.c
+@@ -34,7 +34,11 @@
+ 
+ cSoftplayReceiver::cSoftplayReceiver(const cChannel *Channel, cDevice *Device,
+                 PacketHandlesV100 &SoftHandles) 
++#if APIVERSNUM >= 10500
++        : cReceiver(Channel->GetChannelID(),0,Channel->Vpid()),startChannel(*Channel),
++#else
+         : cReceiver(Channel->Ca(),0,Channel->Vpid()),startChannel(*Channel),
++#endif
+           currChannel(*Channel) {
+                 RECEIVER_DEB("cSoftplayReceiver");
+                 device=Device;