r4079 - in vdr/vdr-plugin-bitstreamout/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2007-01-18 22:29:25 +0100 (Thu, 18 Jan 2007)
New Revision: 4079

Added:
   vdr/vdr-plugin-bitstreamout/trunk/debian/patches/91_bitstreamout-0.85-1.5.0.dpatch
Modified:
   vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
   vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
Log:
Added 91_bitstreamout-0.85-1.5.0.dpatch

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2007-01-17 01:51:18 UTC (rev 4078)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2007-01-18 21:29:25 UTC (rev 4079)
@@ -1,3 +1,10 @@
+vdr-plugin-bitstreamout (0.85-11) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 91_bitstreamout-0.85-1.5.0.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 18 Jan 2007 21:45:41 +0100
+
 vdr-plugin-bitstreamout (0.85-10) experimental; urgency=low
 
   [ Thomas Günther ]

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list	2007-01-17 01:51:18 UTC (rev 4078)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list	2007-01-18 21:29:25 UTC (rev 4079)
@@ -1,2 +1,3 @@
-90_APIVERSION.dpatch
+90_APIVERSION
 01_bitops-FTBFS-fix
+91_bitstreamout-0.85-1.5.0

Added: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/91_bitstreamout-0.85-1.5.0.dpatch
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/91_bitstreamout-0.85-1.5.0.dpatch	2007-01-17 01:51:18 UTC (rev 4078)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/91_bitstreamout-0.85-1.5.0.dpatch	2007-01-18 21:29:25 UTC (rev 4079)
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_bitstreamout-0.85-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@
+--- bitstreamout-0.85/channel.c
++++ bitstreamout-0.85/channel.c
+@@ -48,8 +48,14 @@
+ uint_8  * cInStream::tsdata;
+ cBounce * cInStream::bounce;
+ 
++#if defined(APIVERSNUM) && APIVERSNUM >= 10500
++cInStream::cInStream(tChannelID chnid, int Pid, spdif *dev, ctrl_t &up, cBounce *bPtr)
++#else
+ cInStream::cInStream(int Pid, spdif *dev, ctrl_t &up, cBounce *bPtr)
+-#if defined(VDRVERSNUM) && VDRVERSNUM > 10318
++#endif
++#if defined(APIVERSNUM) && APIVERSNUM >= 10500
++:cReceiver(chnid, -1, Pid),
++#elif defined(VDRVERSNUM) && VDRVERSNUM > 10318
+ :cReceiver(0, -1, Pid),
+ #else
+ :cReceiver(0, -1, 1, Pid),
+@@ -1010,7 +1016,11 @@
+     if (PrimaryDevice->Replaying())
+ 	goto out;
+ 
++#if defined(APIVERSNUM) && APIVERSNUM >= 10500
++    in = new cInStream(Channel->GetChannelID(), Apid, spdifDev, setup, bounce);
++#else
+     in = new cInStream(Apid, spdifDev, setup, bounce);
++#endif
+     if (!in) {
+ 	esyslog("ERROR: out of memory");
+ 	Apid = 0x1FFF;
+--- bitstreamout-0.85/channel.h
++++ bitstreamout-0.85/channel.h
+@@ -102,7 +102,11 @@
+     virtual void Activate(bool on);
+     virtual void Receive(uchar *b, int cnt);
+ public:
++#if defined(APIVERSNUM) && APIVERSNUM >= 10500
++    cInStream(tChannelID chnid, int Pid, spdif *dev, ctrl_t &up, cBounce * bPtr);
++#else
+     cInStream(int Pid, spdif *dev, ctrl_t &up, cBounce * bPtr);
++#endif
+     ~cInStream();
+     uint_16 AudioPid(void) const { return Apid; };
+     const char  *AudioType(void) const { return audioType; };