r4070 - in vdr/vdr-plugin-streamdev/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2007-01-17 01:24:52 +0100 (Wed, 17 Jan 2007)
New Revision: 4070

Added:
   vdr/vdr-plugin-streamdev/trunk/debian/patches/93_streamdev-1.5.0.dpatch
Modified:
   vdr/vdr-plugin-streamdev/trunk/debian/changelog
   vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
Log:
Added 93_streamdev-1.5.0.dpatch

Modified: vdr/vdr-plugin-streamdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/changelog	2007-01-17 00:21:43 UTC (rev 4069)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog	2007-01-17 00:24:52 UTC (rev 4070)
@@ -1,3 +1,10 @@
+vdr-plugin-streamdev (0.3.1+cvs20050522-26) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 93_streamdev-1.5.0.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Wed, 17 Jan 2007 01:23:21 +0100
+
 vdr-plugin-streamdev (0.3.1+cvs20050522-25) experimental; urgency=low
 
   [ Thomas Günther ]

Modified: vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/00list	2007-01-17 00:21:43 UTC (rev 4069)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/00list	2007-01-17 00:24:52 UTC (rev 4070)
@@ -1,5 +1,6 @@
 01_Makefile-fPIC-fix
 
-90_APIVERSION.dpatch
+90_APIVERSION
 91_cvs-20051209
 92_streamdev-csv-vdr-1.3.47
+93_streamdev-1.5.0

Added: vdr/vdr-plugin-streamdev/trunk/debian/patches/93_streamdev-1.5.0.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/93_streamdev-1.5.0.dpatch	2007-01-17 00:21:43 UTC (rev 4069)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/93_streamdev-1.5.0.dpatch	2007-01-17 00:24:52 UTC (rev 4070)
@@ -0,0 +1,97 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93_streamdev-1.5.0.dpatch by Urig at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=564670#post564670
+##
+## Thomas Günther <tom at toms-cafe.de>:
+##   - changed VDRVERSNUM to APIVERSNUM
+##   - adapted to cvs-20051209
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5).
+
+ at DPATCH@
+diff -Naur streamdev-cvs-1.4/client/socket.c streamdev-cvs/client/socket.c
+--- streamdev-cvs-1.4/client/socket.c	2007-01-14 00:18:43.000000000 +0100
++++ streamdev-cvs/client/socket.c	2007-01-14 00:21:27.000000000 +0100
+@@ -54,7 +54,7 @@
+ 		return false;
+ 	}
+ 
+-	uint64 elapsed = starttime.Elapsed();
++	uint64_t elapsed = starttime.Elapsed();
+ 	if (Expected != 0) { // XXX+ What if elapsed > TimeoutMs?
+ 		TimeoutMs -= elapsed;
+ 		return Expect(Expected, NULL, TimeoutMs);
+diff -Naur streamdev-cvs-1.4/server/connection.c streamdev-cvs/server/connection.c
+--- streamdev-cvs-1.4/server/connection.c	2007-01-14 00:18:43.000000000 +0100
++++ streamdev-cvs/server/connection.c	2007-01-14 00:25:11.000000000 +0100
+@@ -132,7 +132,11 @@
+ 	Dprintf(" * GetDevice(const cChannel*, int)\n");
+ 	Dprintf(" * -------------------------------\n");
+ 
++#if APIVERSNUM < 10500
+ 	device = cDevice::GetDevice(Channel, Priority);
++#else
++	device = cDevice::GetDevice(Channel, Priority, false);
++#endif
+ 
+ 	Dprintf(" * Found following device: %p (%d)\n", device, 
+ 			device ? device->CardIndex() + 1 : 0);
+@@ -150,7 +154,11 @@
+ 		const cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel());
+ 		//isyslog("streamdev-server: Detaching current receiver");
+ 		//Detach(); XXX+
++#if APIVERSNUM < 10500
+ 		device = cDevice::GetDevice(Channel, Priority);
++#else
++		device = cDevice::GetDevice(Channel, Priority, false);
++#endif
+ 		//Attach(); XXX+
+ 		Dprintf(" * Found following device: %p (%d)\n", device, 
+ 				device ? device->CardIndex() + 1 : 0);
+diff -Naur streamdev-cvs-1.4/server/livestreamer.c streamdev-cvs/server/livestreamer.c
+--- streamdev-cvs-1.4/server/livestreamer.c	2007-01-14 00:18:43.000000000 +0100
++++ streamdev-cvs/server/livestreamer.c	2007-01-14 00:54:41.806616240 +0100
+@@ -8,9 +8,15 @@
+ 
+ // --- cStreamdevLiveReceiver -------------------------------------------------
+ 
++#if APIVERSNUM < 10500
+ cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevLiveStreamer *Streamer, int Ca, 
+                                                int Priority, const int *Pids):
+ 		cReceiver(Ca, Priority, 0, Pids),
++#else
++cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevLiveStreamer *Streamer, tChannelID Id, 
++                                               int Priority, const int *Pids):
++		cReceiver(Id, Priority, 0, Pids),
++#endif
+ 		m_Streamer(Streamer)
+ {
+ }
+@@ -90,7 +96,11 @@
+ 	DELETENULL(m_Receiver);
+ 	if (m_NumPids > 0) {
+ 		Dprintf("Creating Receiver to respect changed pids\n");
++#if APIVERSNUM < 10500
+ 		m_Receiver = new cStreamdevLiveReceiver(this, m_Channel->Ca(), m_Priority, m_Pids);
++#else
++		m_Receiver = new cStreamdevLiveReceiver(this, m_Channel->GetChannelID(), m_Priority, m_Pids);
++#endif
+ 		if (IsRunning() && m_Device != NULL) {
+ 			Dprintf("Attaching new receiver\n");
+ 			Attach();
+diff -Naur streamdev-cvs-1.4/server/livestreamer.h streamdev-cvs/server/livestreamer.h
+--- streamdev-cvs-1.4/server/livestreamer.h	2007-01-14 00:18:43.000000000 +0100
++++ streamdev-cvs/server/livestreamer.h	2007-01-14 00:26:45.000000000 +0100
+@@ -26,7 +26,11 @@
+ 	virtual void Receive(uchar *Data, int Length);
+ 
+ public:
++#if APIVERSNUM < 10500
+ 	cStreamdevLiveReceiver(cStreamdevLiveStreamer *Streamer, int Ca, int Priority, const int *Pids);
++#else
++	cStreamdevLiveReceiver(cStreamdevLiveStreamer *Streamer, tChannelID Id, int Priority, const int *Pids);
++#endif
+ 	virtual ~cStreamdevLiveReceiver();
+ };
+