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

[Thomas Günther]

Author: tom-guest
Date: 2006-01-28 16:06:17 +0000 (Sat, 28 Jan 2006)
New Revision: 1879

Added:
   vdr/vdr-plugin-bitstreamout/trunk/debian/patches/90_bitstreamout-0.84-1.3.38.dpatch
Modified:
   vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
   vdr/vdr-plugin-bitstreamout/trunk/debian/copyright
   vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
Log:
Added 90_bitstreamout-0.84-1.3.38.dpatch

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2006-01-26 22:15:54 UTC (rev 1878)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2006-01-28 16:06:17 UTC (rev 1879)
@@ -1,3 +1,11 @@
+vdr-plugin-bitstreamout (0.84-15) unstable; urgency=low
+
+  * Thomas Günther <tom at toms-cafe.de>
+    - Added 90_bitstreamout-0.84-1.3.38.dpatch
+    - Shortened debian/copyright
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 28 Jan 2006 16:49:10 +0100
+
 vdr-plugin-bitstreamout (0.84-14) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/copyright	2006-01-26 22:15:54 UTC (rev 1878)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/copyright	2006-01-28 16:06:17 UTC (rev 1879)
@@ -7,20 +7,5 @@
 
 Copyright:
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software 
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-  MA 02110-1301, USA.
-
-  see /usr/share/common-licenses/GPL
-
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list	2006-01-26 22:15:54 UTC (rev 1878)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list	2006-01-28 16:06:17 UTC (rev 1879)
@@ -1 +1,3 @@
 01_FTBFS-fix
+
+90_bitstreamout-0.84-1.3.38

Added: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/90_bitstreamout-0.84-1.3.38.dpatch
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/90_bitstreamout-0.84-1.3.38.dpatch	2006-01-26 22:15:54 UTC (rev 1878)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/90_bitstreamout-0.84-1.3.38.dpatch	2006-01-28 16:06:17 UTC (rev 1879)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_bitstreamout-0.84-1.3.38.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/bitstreamout-0.84-1.3.38.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.38.
+
+ at DPATCH@
+--- bitstreamout-0.84/channel.c
++++ bitstreamout-0.84/channel.c
+@@ -1050,7 +1050,11 @@
+     return;
+ }
+ 
++#if VDRVERSNUM >= 10338
++void cChannelOutSPDif::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
++#else
+ void cChannelOutSPDif::Recording(const cDevice  *Device,  const char *Name)
++#endif
+ {
+     cDevice *PrimaryDevice = cDevice::PrimaryDevice();
+ 
+@@ -1060,7 +1064,11 @@
+     if (Device != PrimaryDevice)
+ 	goto out;
+ 
++#if VDRVERSNUM >= 10338
++    recording = On;
++#else
+     recording = (Name != NULL);
++#endif
+ 
+     if (!recording)
+ 	goto out;
+@@ -1073,9 +1081,15 @@
+     IfNeededMuteSPDIF();		// On close the S/P-DIF is not muted anymore
+ }
+ 
++#if VDRVERSNUM >= 10338
++void cChannelOutSPDif::Replaying(const cControl *Control, const char *Name, const char *FileName, bool On)
++{
++    replaying = On;
++#else
+ void cChannelOutSPDif::Replaying(const cControl *Control, const char *Name)
+ {
+     replaying = (Name != NULL);
++#endif
+ 
+ #if defined(VDRVERSNUM) && VDRVERSNUM <= 10317
+     Player = (static_cast<const cControlPerm *>(Control))->Player();
+--- bitstreamout-0.84/channel.h
++++ bitstreamout-0.84/channel.h
+@@ -166,8 +166,13 @@
+     virtual void Action(void);
+     virtual void Activate(bool on);
+     virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
++#if VDRVERSNUM >= 10338
++    virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
++    virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
++#else
+     virtual void Recording(const cDevice  *Device,  const char *Name);
+     virtual void Replaying(const cControl *Control, const char *Name);
++#endif
+ public:
+     cChannelOutSPDif(spdif &dev, ctrl_t &up, cBounce * bPtr, const char *script);
+     ~cChannelOutSPDif(void);