r4547 - in vdr/vdr-plugin-streamdev/trunk/debian: . patches
Thomas Schmidt
tschmidt at alioth.debian.org
Sat May 5 10:34:05 UTC 2007
Author: tschmidt
Date: 2007-05-05 10:34:05 +0000 (Sat, 05 May 2007)
New Revision: 4547
Added:
vdr/vdr-plugin-streamdev/trunk/debian/patches/01_include-fix.dpatch
Removed:
vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-streamdev/trunk/debian/patches/90_APIVERSION.dpatch
vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051209.dpatch
vdr/vdr-plugin-streamdev/trunk/debian/patches/92_streamdev-csv-vdr-1.3.47.dpatch
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/control
vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
Log:
* New upstream cvs snapshot
- removed following dpatches:
+ 01_Makefile-fPIC-fix.dpatch
+ 91_cvs-20051209.dpatch
+ 92_streamdev-csv-vdr-1.3.47.dpatch
+ 93_streamdev-1.5.0.dpatch
+ 90_APIVERSION.dpatch
- added 01_include-fix.dpatch
* Removed versioned Build-Dependancy to dpatch, because even sarge has the
required version of dpatch (2.0.9)
Modified: vdr/vdr-plugin-streamdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/changelog 2007-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog 2007-05-05 10:34:05 UTC (rev 4547)
@@ -1,3 +1,18 @@
+vdr-plugin-streamdev (0.3.3~cvs20070505-1) UNRELEASED; urgency=low
+
+ * New upstream cvs snapshot
+ - removed following dpatches:
+ + 01_Makefile-fPIC-fix.dpatch
+ + 91_cvs-20051209.dpatch
+ + 92_streamdev-csv-vdr-1.3.47.dpatch
+ + 93_streamdev-1.5.0.dpatch
+ + 90_APIVERSION.dpatch
+ - added 01_include-fix.dpatch
+ * Removed versioned Build-Dependancy to dpatch, because even sarge has the
+ required version of dpatch (2.0.9)
+
+ -- Thomas Schmidt <tschmidt at debian.org> Sat, 5 May 2007 12:11:37 +0200
+
vdr-plugin-streamdev (0.3.1+cvs20050522-28) experimental; urgency=low
* Release for vdrdevel 1.5.2
Modified: vdr/vdr-plugin-streamdev/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/control 2007-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/control 2007-05-05 10:34:05 UTC (rev 4547)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Peter Siering <ps at ctmagazin.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.5-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.5-1), dpatch
Standards-Version: 3.7.2
Package: vdr-plugin-streamdev-client
Modified: vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/00list 2007-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/00list 2007-05-05 10:34:05 UTC (rev 4547)
@@ -1,6 +1 @@
-01_Makefile-fPIC-fix
-
-90_APIVERSION
-91_cvs-20051209
-92_streamdev-csv-vdr-1.3.47
-93_streamdev-1.5.0
+01_include-fix
Deleted: vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2007-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2007-05-05 10:34:05 UTC (rev 4547)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## Makefile-fPIC-fix patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefile to fix potential FTBFS.
-
- at DPATCH@
-diff -urNad vdr-plugin-streamdev-0.3.1+cvs20050410/Makefile /tmp/dpep.vNORJt/vdr-plugin-streamdev-0.3.1+cvs20050410/Makefile
---- vdr-plugin-streamdev-0.3.1+cvs20050410/Makefile 2005-04-10 12:27:17.155199000 +0200
-+++ /tmp/dpep.vNORJt/vdr-plugin-streamdev-0.3.1+cvs20050410/Makefile 2005-04-10 12:27:17.511144888 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
-
- CXX ?= g++
--CXXFLAGS ?= -W -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -W -Woverloaded-virtual
-
- ### The directory environment:
-
Added: vdr/vdr-plugin-streamdev/trunk/debian/patches/01_include-fix.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/01_include-fix.dpatch 2007-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/01_include-fix.dpatch 2007-05-05 10:34:05 UTC (rev 4547)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_include-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-streamdev-0.3.3~cvs20070505~/server/livestreamer.c vdr-plugin-streamdev-0.3.3~cvs20070505/server/livestreamer.c
+--- vdr-plugin-streamdev-0.3.3~cvs20070505~/server/livestreamer.c 2007-05-05 12:00:35.000000000 +0200
++++ vdr-plugin-streamdev-0.3.3~cvs20070505/server/livestreamer.c 2007-05-05 12:24:32.000000000 +0200
+@@ -1,7 +1,7 @@
+ #include <assert.h>
+
+-#include <libsi/section.h>
+-#include <libsi/descriptor.h>
++#include <vdr/libsi/section.h>
++#include <vdr/libsi/descriptor.h>
+
+ #include <vdr/ringbuffer.h>
+
Deleted: vdr/vdr-plugin-streamdev/trunk/debian/patches/90_APIVERSION.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/90_APIVERSION.dpatch 2007-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/90_APIVERSION.dpatch 2007-05-05 10:34:05 UTC (rev 4547)
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
-
-case "$1" in
- -patch)
- sed -i -e s/VDRVERSION/APIVERSION/g Makefile
- ;;
- -unpatch)
- sed -i -e s/APIVERSION/VDRVERSION/g Makefile
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
- ;;
-esac
-
-exit 0
Deleted: vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051209.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051209.dpatch 2007-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051209.dpatch 2007-05-05 10:34:05 UTC (rev 4547)
@@ -1,88 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 91_cvs-20051107.dpatch by Sascha Volkenandt <sascha at akv-soft.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.3.36.
-
- at DPATCH@
-diff -Nur streamdev-cvs20050522/client/filter.c streamdev-cvs20051209/client/filter.c
---- streamdev-cvs20050522/client/filter.c 2005-05-22 00:29:37.000000000 +0200
-+++ streamdev-cvs20051209/client/filter.c 2005-11-06 17:43:58.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * $Id: filter.c,v 1.2 2005/02/08 13:59:16 lordjaxom Exp $
-+ * $Id: filter.c,v 1.3 2005/11/06 16:43:58 lordjaxom Exp $
- */
-
- #include "client/filter.h"
-@@ -8,6 +8,7 @@
- #include "common.h"
-
- #include <vdr/ringbuffer.h>
-+#include <vdr/device.h>
-
- #if VDRVERSNUM >= 10300
-
-diff -Nur streamdev-cvs20050522/common.h streamdev-cvs20051209/common.h
---- streamdev-cvs20050522/common.h 2005-05-22 00:29:37.000000000 +0200
-+++ streamdev-cvs20051209/common.h 2005-11-06 17:43:58.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * $Id: common.h,v 1.6 2005/05/09 20:22:29 lordjaxom Exp $
-+ * $Id: common.h,v 1.7 2005/11/06 16:43:58 lordjaxom Exp $
- */
-
- #ifndef VDR_STREAMDEV_COMMON_H
-@@ -35,6 +35,10 @@
- # define FLUSH() Skins.Flush()
- #endif
-
-+#if VDRVERSNUM >= 10336
-+# define MAXPARSEBUFFER KILOBYTE(16)
-+#endif
-+
- /* Check if a channel is a radio station. */
- #define ISRADIO(x) ((x)->Vpid()==0||(x)->Vpid()==1||(x)->Vpid()==0x1fff)
-
-diff -Nur streamdev-cvs20050522/remux/ts2es.c streamdev-cvs20051209/remux/ts2es.c
---- streamdev-cvs20050522/remux/ts2es.c 2005-05-22 00:29:37.000000000 +0200
-+++ streamdev-cvs20051209/remux/ts2es.c 2005-11-06 17:43:58.000000000 +0100
-@@ -2,6 +2,7 @@
- #include "server/streamer.h"
- #include "libdvbmpeg/transform.h"
- #include "common.h"
-+#include <vdr/device.h>
-
- // from VDR's remux.c
- #define MAXNONUSEFULDATA (10*1024*1024)
-diff -Nur streamdev-cvs20050522/remux/ts2ps.c streamdev-cvs20051209/remux/ts2ps.c
---- streamdev-cvs20050522/remux/ts2ps.c 2005-05-22 00:29:37.000000000 +0200
-+++ streamdev-cvs20051209/remux/ts2ps.c 2005-11-06 17:43:58.000000000 +0100
-@@ -1,6 +1,7 @@
- #include "remux/ts2ps.h"
- #include "server/streamer.h"
- #include <vdr/channels.h>
-+#include <vdr/device.h>
-
- class cTS2PS {
- friend void PutPES(uint8_t *Buffer, int Size, void *Data);
-diff -Nur streamdev-cvs20050522/server/livefilter.h streamdev-cvs20051209/server/livefilter.h
---- streamdev-cvs20050522/server/livefilter.h 2005-05-22 00:29:37.000000000 +0200
-+++ streamdev-cvs20051209/server/livefilter.h 2005-11-07 20:28:41.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * $Id: livefilter.h,v 1.1.1.1 2004/12/30 22:44:27 lordjaxom Exp $
-+ * $Id: livefilter.h,v 1.2 2005/11/07 19:28:41 lordjaxom Exp $
- */
-
- #ifndef VDR_STREAMEV_LIVEFILTER_H
-@@ -11,6 +11,8 @@
-
- #include <vdr/filter.h>
-
-+class cStreamdevLiveStreamer;
-+
- class cStreamdevLiveFilter: public cFilter {
- friend class cStreamdevLiveStreamer;
-
Deleted: vdr/vdr-plugin-streamdev/trunk/debian/patches/92_streamdev-csv-vdr-1.3.47.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/92_streamdev-csv-vdr-1.3.47.dpatch 2007-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/92_streamdev-csv-vdr-1.3.47.dpatch 2007-05-05 10:34:05 UTC (rev 4547)
@@ -1,205 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 92_streamdev-csv-vdr-1.3.47.dpatch by Hulk at vdrportal.de
-## http://vdr-portal.de/board/thread.php?postid=453422#post453422
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.3.47, add option for externremux.sh.
-
- at DPATCH@
-Index: i18n.c
-===================================================================
-RCS file: /var/cvsroot/streamdev/i18n.c,v
-retrieving revision 1.3
-diff -u -r1.3 i18n.c
---- streamdev-csv/i18n.c 10 May 2005 21:02:24 -0000 1.3
-+++ streamdev-csv/i18n.c 17 Apr 2006 16:29:10 -0000
-@@ -807,5 +807,25 @@
- "" // Russian
- #endif
- },
-+ { "Streaming TV", // English
-+ "Streaming TV",// Deutsch
-+ "", // Slovenski
-+ "", // Italiano
-+ "", // Nederlands
-+ "", // Português
-+ "", // Français
-+ "", // Norsk
-+ "", // suomi
-+ "", // Polski
-+ "", // Español
-+ "", // Ellinika
-+ "", // Svenska
-+ "", // Romaneste
-+ "", // Magyar
-+ "", // Catala
-+#if VDRVERSNUM >= 10300
-+ "" // Russian
-+#endif
-+ },
- { NULL }
- };
-Index: streamdev-server.c
-===================================================================
-RCS file: /var/cvsroot/streamdev/streamdev-server.c,v
-retrieving revision 1.2
-diff -u -r1.2 streamdev-server.c
---- streamdev-csv/streamdev-server.c 9 May 2005 20:22:29 -0000 1.2
-+++ streamdev-csv/streamdev-server.c 17 Apr 2006 16:29:10 -0000
-@@ -6,10 +6,12 @@
- * $Id: 92_streamdev-csv-vdr-1.3.47.dpatch,v 1.1 2006/04/19 13:52:15 vdrtom Exp $
- */
-
-+#include <getopt.h>
- #include "streamdev-server.h"
- #include "server/setup.h"
- #include "server/server.h"
- #include "server/suspend.h"
-+#include "remux/extern.h"
- #include "i18n.h"
-
- const char *cPluginStreamdevServer::DESCRIPTION = "VDR Streaming Server";
-@@ -27,6 +29,36 @@
- return tr(DESCRIPTION);
- }
-
-+const char *cPluginStreamdevServer::CommandLineHelp(void)
-+{
-+ static char *help_str=0;
-+
-+ free(help_str); // for easier orientation, this is column 80|
-+ asprintf(&help_str," -r CMD, --remux=CMD use CMD to remux stream\n"
-+ " (default: \"%s\")\n",
-+ g_szRemuxScript
-+ );
-+ return help_str;
-+}
-+
-+bool cPluginStreamdevServer::ProcessArgs(int argc, char *argv[])
-+{
-+ static struct option long_options[] = {
-+ { "remux", required_argument, NULL, 'r' },
-+ { NULL }
-+ };
-+
-+ int c, option_index = 0;
-+ while((c=getopt_long(argc,argv,"r:",long_options,&option_index))!=-1) {
-+ switch (c) {
-+ case 'r': g_szRemuxScript=optarg;break;
-+ default: return false;
-+ }
-+ }
-+ return true;
-+}
-+
-+
- bool cPluginStreamdevServer::Start(void)
- {
- i18n_name = Name();
-@@ -55,9 +87,13 @@
- cStreamdevServer::Destruct();
- }
-
--bool cPluginStreamdevServer::Active(void)
-+cString cPluginStreamdevServer::Active(void)
- {
-- return cStreamdevServer::Active();
-+ if(cStreamdevServer::Active())
-+ {
-+ return tr("Streaming TV");
-+ }
-+ return NULL;
- }
-
- const char *cPluginStreamdevServer::MainMenuEntry(void)
-Index: streamdev-server.h
-===================================================================
-RCS file: /var/cvsroot/streamdev/streamdev-server.h,v
-retrieving revision 1.2
-diff -u -r1.2 streamdev-server.h
---- streamdev-csv/streamdev-server.h 9 May 2005 20:22:29 -0000 1.2
-+++ streamdev-csv/streamdev-server.h 17 Apr 2006 16:29:10 -0000
-@@ -21,11 +21,14 @@
- virtual const char *Description(void);
- virtual bool Start(void);
- virtual void Stop(void);
-- virtual bool Active(void);
-+ virtual cString Active(void);
- virtual const char *MainMenuEntry(void);
- virtual cOsdObject *MainMenuAction(void);
- virtual cMenuSetupPage *SetupMenu(void);
- virtual bool SetupParse(const char *Name, const char *Value);
-+
-+ virtual bool ProcessArgs(int argc, char *argv[]);
-+ virtual const char *CommandLineHelp(void);
- };
-
- #endif // VDR_STREAMDEVSERVER_H
-Index: remux/extern.c
-===================================================================
-RCS file: /var/cvsroot/streamdev/remux/extern.c,v
-retrieving revision 1.1
-diff -u -r1.1 extern.c
---- streamdev-csv/remux/extern.c 12 Feb 2005 17:20:35 -0000 1.1
-+++ streamdev-csv/remux/extern.c 17 Apr 2006 16:29:10 -0000
-@@ -3,6 +3,9 @@
- #include <vdr/tools.h>
- #include <sys/types.h>
- #include <signal.h>
-+#include <wait.h>
-+
-+const char *g_szRemuxScript = "externremux.sh";
-
- class cTSExt: public cThread {
- private:
-@@ -10,7 +13,6 @@
- bool m_Active;
- int m_Process;
- int m_Inpipe, m_Outpipe;
--
- protected:
- virtual void Action(void);
-
-@@ -47,6 +49,7 @@
- }
-
- if (m_Process == 0) {
-+
- // child process
- dup2(inpipe[0], STDIN_FILENO);
- close(inpipe[1]);
-@@ -57,9 +60,7 @@
- for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
- close(i); //close all dup'ed filedescriptors
-
-- printf("starting externremux.sh\n");
-- execl("/bin/sh", "sh", "-c", "/root/externremux.sh", NULL);
-- printf("failed externremux.sh\n");
-+ execl("/bin/sh", "sh", "-c", g_szRemuxScript, NULL);
- _exit(-1);
- }
-
-@@ -77,6 +78,7 @@
- close(m_Outpipe);
- close(m_Inpipe);
- kill(m_Process, SIGTERM);
-+ waitpid(m_Process, 0, 0);
- }
-
- void cTSExt::Action(void)
-Index: remux/extern.h
-===================================================================
-RCS file: /var/cvsroot/streamdev/remux/extern.h,v
-retrieving revision 1.1
-diff -u -r1.1 extern.h
---- streamdev-csv/remux/extern.h 12 Feb 2005 17:20:35 -0000 1.1
-+++ streamdev-csv/remux/extern.h 17 Apr 2006 16:29:10 -0000
-@@ -4,6 +4,8 @@
- #include "remux/tsremux.h"
- #include <vdr/ringbuffer.h>
-
-+extern const char *g_szRemuxScript;
-+
- class cTSExt;
-
- class cExternRemux: public cTSRemux {
Deleted: 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-05-05 10:30:55 UTC (rev 4546)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/93_streamdev-1.5.0.dpatch 2007-05-05 10:34:05 UTC (rev 4547)
@@ -1,97 +0,0 @@
-#! /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();
- };
-
More information about the pkg-vdr-dvb-changes
mailing list