r5920 - in /vdr/vdr-plugin-iptv/trunk/debian: README.Debian changelog install patches/00list patches/02_libsi-include.dpatch patches/03_channel-name-parameter.dpatch patches/03_de-po.dpatch
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Wed Nov 21 10:10:10 UTC 2007
Author: tiber-guest
Date: Wed Nov 21 10:10:10 2007
New Revision: 5920
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5920
Log:
iptv update to 0.0.4
Added:
vdr/vdr-plugin-iptv/trunk/debian/patches/03_channel-name-parameter.dpatch
Removed:
vdr/vdr-plugin-iptv/trunk/debian/patches/03_de-po.dpatch
Modified:
vdr/vdr-plugin-iptv/trunk/debian/README.Debian
vdr/vdr-plugin-iptv/trunk/debian/changelog
vdr/vdr-plugin-iptv/trunk/debian/install
vdr/vdr-plugin-iptv/trunk/debian/patches/00list
vdr/vdr-plugin-iptv/trunk/debian/patches/02_libsi-include.dpatch (props changed)
Modified: vdr/vdr-plugin-iptv/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/README.Debian?rev=5920&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/README.Debian (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/README.Debian Wed Nov 21 10:10:10 2007
@@ -11,12 +11,11 @@
In the channels.conf:
IPTV-EXT;IPTV:1:IPTV|EXT|vlc2iptv|1:P:0:2:3:0:0:1:0:0:0
- ^
- |
- <Parameter>
+ ^
+ |- <Channel Name>
-<Parameter> specifies, which URL should be transcoded. To configure this URL,
-create a file `/etc/vdr/plugins/iptv/vlcinput/<Parameter>.conf` with the
+<Channel Name> specifies, which URL should be transcoded. To configure this URL,
+create a file `/etc/vdr/plugins/iptv/vlcinput/<Channel Name>.conf` with the
following contents:
URL="http://www.foo.net/bar-stream"
Modified: vdr/vdr-plugin-iptv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/changelog?rev=5920&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/changelog Wed Nov 21 10:10:10 2007
@@ -1,3 +1,12 @@
+vdr-plugin-iptv (0.0.4-1) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * New upstream release
+ * Removed 03_de-po.dpatch (fixed upstream)
+ * Added 03_channel-name-parameter.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 21 Nov 2007 09:51:53 +0100
+
vdr-plugin-iptv (0.0.3-2xeatre1) unstable; urgency=low
* Rebuild for new vdr 1.5.11-1xeatre1
Modified: vdr/vdr-plugin-iptv/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/install?rev=5920&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/install (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/install Wed Nov 21 10:10:10 2007
@@ -2,4 +2,3 @@
locale/* usr/share/locale/
debian/vlc2iptv usr/share/vdr-plugin-iptv/
-
Modified: vdr/vdr-plugin-iptv/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/patches/00list?rev=5920&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/patches/00list Wed Nov 21 10:10:10 2007
@@ -1,2 +1,2 @@
02_libsi-include
-03_de-po
+03_channel-name-parameter
Propchange: vdr/vdr-plugin-iptv/trunk/debian/patches/02_libsi-include.dpatch
('svn:executable' removed)
Added: vdr/vdr-plugin-iptv/trunk/debian/patches/03_channel-name-parameter.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/patches/03_channel-name-parameter.dpatch?rev=5920&op=file
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/patches/03_channel-name-parameter.dpatch (added)
+++ vdr/vdr-plugin-iptv/trunk/debian/patches/03_channel-name-parameter.dpatch Wed Nov 21 10:10:10 2007
@@ -1,0 +1,191 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_channel-name-parameter.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Passes channel name to external transcoding script.
+
+ at DPATCH@
+diff -urNad vdr-plugin-iptv-0.0.4~/device.c vdr-plugin-iptv-0.0.4/device.c
+--- vdr-plugin-iptv-0.0.4~/device.c 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/device.c 2007-11-21 11:04:53.000000000 +0100
+@@ -228,7 +228,7 @@
+ error("ERROR: Unrecognized IPTV channel settings: %s", Channel->PluginParam());
+ return false;
+ }
+- pIptvStreamer->Set(location, parameter, deviceIndex, protocol);
++ pIptvStreamer->Set(location, parameter, deviceIndex, Channel->Name(), protocol);
+ if (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
+ pSidScanner->SetChannel(Channel);
+ return true;
+diff -urNad vdr-plugin-iptv-0.0.4~/protocolext.c vdr-plugin-iptv-0.0.4/protocolext.c
+--- vdr-plugin-iptv-0.0.4~/protocolext.c 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocolext.c 2007-11-21 11:04:53.000000000 +0100
+@@ -57,7 +57,7 @@
+ close(i);
+ // Execute the external script
+ char* cmd = NULL;
+- asprintf(&cmd, "%s %d %d", scriptFile, scriptParameter, socketPort);
++ asprintf(&cmd, "%s %d %d \"%s\"", scriptFile, scriptParameter, socketPort, channelName);
+ debug("cIptvProtocolExt::ExecuteScript(child): %s\n", cmd);
+ if (execl("/bin/sh", "sh", "-c", cmd, NULL) == -1) {
+ error("ERROR: Script executionfailed: %s", cmd);
+@@ -140,9 +140,9 @@
+ return cIptvUdpSocket::Read(BufferAddr);
+ }
+
+-bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int Index)
++bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int Index, const char* Name)
+ {
+- debug("cIptvProtocolExt::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
++ debug("cIptvProtocolExt::Set(): Location=%s Parameter=%d Index=%d\n Name=%s\n", Location, Parameter, Index, Name);
+ if (!isempty(Location)) {
+ struct stat stbuf;
+ // Update script file and parameter
+@@ -153,6 +153,7 @@
+ return false;
+ }
+ scriptParameter = Parameter;
++ channelName = Name;
+ // Update listen port
+ socketPort = IptvConfig.GetExtProtocolBasePort() + Index;
+ }
+diff -urNad vdr-plugin-iptv-0.0.4~/protocolext.h vdr-plugin-iptv-0.0.4/protocolext.h
+--- vdr-plugin-iptv-0.0.4~/protocolext.h 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocolext.h 2007-11-21 11:04:53.000000000 +0100
+@@ -19,6 +19,7 @@
+ char* listenAddr;
+ char* scriptFile;
+ int scriptParameter;
++ const char* channelName;
+
+ private:
+ void TerminateScript(void);
+@@ -28,7 +29,7 @@
+ cIptvProtocolExt();
+ virtual ~cIptvProtocolExt();
+ int Read(unsigned char* *BufferAddr);
+- virtual bool Set(const char* Location, const int Parameter, const int Index);
++ virtual bool Set(const char* Location, const int Parameter, const int Index, const char* Name);
+ virtual bool Open(void);
+ virtual bool Close(void);
+ virtual cString GetInformation(void);
+diff -urNad vdr-plugin-iptv-0.0.4~/protocolfile.c vdr-plugin-iptv-0.0.4/protocolfile.c
+--- vdr-plugin-iptv-0.0.4~/protocolfile.c 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocolfile.c 2007-11-21 11:04:53.000000000 +0100
+@@ -102,7 +102,7 @@
+ return true;
+ }
+
+-bool cIptvProtocolFile::Set(const char* Location, const int Parameter, const int Index)
++bool cIptvProtocolFile::Set(const char* Location, const int Parameter, const int Index, const char* Name)
+ {
+ debug("cIptvProtocolFile::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+ if (!isempty(Location)) {
+diff -urNad vdr-plugin-iptv-0.0.4~/protocolfile.h vdr-plugin-iptv-0.0.4/protocolfile.h
+--- vdr-plugin-iptv-0.0.4~/protocolfile.h 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocolfile.h 2007-11-21 11:04:53.000000000 +0100
+@@ -29,7 +29,7 @@
+ cIptvProtocolFile();
+ virtual ~cIptvProtocolFile();
+ virtual int Read(unsigned char* *BufferAddr);
+- virtual bool Set(const char* Location, const int Parameter, const int Index);
++ virtual bool Set(const char* Location, const int Parameter, const int Index, const char* Name);
+ virtual bool Open(void);
+ virtual bool Close(void);
+ virtual cString GetInformation(void);
+diff -urNad vdr-plugin-iptv-0.0.4~/protocolhttp.c vdr-plugin-iptv-0.0.4/protocolhttp.c
+--- vdr-plugin-iptv-0.0.4~/protocolhttp.c 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocolhttp.c 2007-11-21 11:04:53.000000000 +0100
+@@ -224,7 +224,7 @@
+ return cIptvTcpSocket::Read(BufferAddr);
+ }
+
+-bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int Index)
++bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int Index, const char* Name)
+ {
+ debug("cIptvProtocolHttp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+ if (!isempty(Location)) {
+diff -urNad vdr-plugin-iptv-0.0.4~/protocolhttp.h vdr-plugin-iptv-0.0.4/protocolhttp.h
+--- vdr-plugin-iptv-0.0.4~/protocolhttp.h 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocolhttp.h 2007-11-21 11:04:53.000000000 +0100
+@@ -29,7 +29,7 @@
+ cIptvProtocolHttp();
+ virtual ~cIptvProtocolHttp();
+ int Read(unsigned char* *BufferAddr);
+- virtual bool Set(const char* Location, const int Parameter, const int Index);
++ virtual bool Set(const char* Location, const int Parameter, const int Index, const char* Name);
+ virtual bool Open(void);
+ virtual bool Close(void);
+ virtual cString GetInformation(void);
+diff -urNad vdr-plugin-iptv-0.0.4~/protocolif.h vdr-plugin-iptv-0.0.4/protocolif.h
+--- vdr-plugin-iptv-0.0.4~/protocolif.h 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocolif.h 2007-11-21 11:04:53.000000000 +0100
+@@ -14,7 +14,7 @@
+ cIptvProtocolIf() {}
+ virtual ~cIptvProtocolIf() {}
+ virtual int Read(unsigned char* *BufferAddr) = 0;
+- virtual bool Set(const char* Location, const int Parameter, const int Index) = 0;
++ virtual bool Set(const char* Location, const int Parameter, const int Index, const char* Name) = 0;
+ virtual bool Open(void) = 0;
+ virtual bool Close(void) = 0;
+ virtual cString GetInformation(void) = 0;
+diff -urNad vdr-plugin-iptv-0.0.4~/protocoludp.c vdr-plugin-iptv-0.0.4/protocoludp.c
+--- vdr-plugin-iptv-0.0.4~/protocoludp.c 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocoludp.c 2007-11-21 11:04:53.000000000 +0100
+@@ -97,7 +97,7 @@
+ return cIptvUdpSocket::Read(BufferAddr);
+ }
+
+-bool cIptvProtocolUdp::Set(const char* Location, const int Parameter, const int Index)
++bool cIptvProtocolUdp::Set(const char* Location, const int Parameter, const int Index, const char* Name)
+ {
+ debug("cIptvProtocolUdp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+ if (!isempty(Location)) {
+diff -urNad vdr-plugin-iptv-0.0.4~/protocoludp.h vdr-plugin-iptv-0.0.4/protocoludp.h
+--- vdr-plugin-iptv-0.0.4~/protocoludp.h 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/protocoludp.h 2007-11-21 11:04:53.000000000 +0100
+@@ -25,7 +25,7 @@
+ cIptvProtocolUdp();
+ virtual ~cIptvProtocolUdp();
+ int Read(unsigned char* *BufferAddr);
+- virtual bool Set(const char* Location, const int Parameter, const int Index);
++ virtual bool Set(const char* Location, const int Parameter, const int Index, const char* Name);
+ virtual bool Open(void);
+ virtual bool Close(void);
+ virtual cString GetInformation(void);
+diff -urNad vdr-plugin-iptv-0.0.4~/streamer.c vdr-plugin-iptv-0.0.4/streamer.c
+--- vdr-plugin-iptv-0.0.4~/streamer.c 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/streamer.c 2007-11-21 11:04:53.000000000 +0100
+@@ -84,9 +84,9 @@
+ return true;
+ }
+
+-bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol)
++bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Index, const char* Name, cIptvProtocolIf* Protocol)
+ {
+- debug("cIptvStreamer::Set(): %s:%d\n", Location, Parameter);
++ debug("cIptvStreamer::Set(): %s:%d (%s)\n", Location, Parameter, Name);
+ if (!isempty(Location)) {
+ // Update protocol; Close the existing one if changed
+ if (protocol != Protocol) {
+@@ -98,7 +98,7 @@
+ }
+ // Set protocol location and parameter
+ if (protocol)
+- protocol->Set(Location, Parameter, Index);
++ protocol->Set(Location, Parameter, Index, Name);
+ }
+ return true;
+ }
+diff -urNad vdr-plugin-iptv-0.0.4~/streamer.h vdr-plugin-iptv-0.0.4/streamer.h
+--- vdr-plugin-iptv-0.0.4~/streamer.h 2007-11-04 03:20:00.000000000 +0100
++++ vdr-plugin-iptv-0.0.4/streamer.h 2007-11-21 11:04:53.000000000 +0100
+@@ -29,7 +29,7 @@
+ cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex);
+ virtual ~cIptvStreamer();
+ virtual void Action(void);
+- bool Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol);
++ bool Set(const char* Location, const int Parameter, const int Index, const char* Name, cIptvProtocolIf* Protocol);
+ bool Open(void);
+ bool Close(void);
+ cString GetInformation(void);
More information about the pkg-vdr-dvb-changes
mailing list