Updated HISTORY.

Updated patches for vdr-1.7.7.
Fixed setting parameters when protocol changes (Thanks to Peter Holik for reporting this one).
2023-10-10 11:37:03 +00:00 · 2009-06-01 11:17:18 +03:00 · 2009-05-22 11:00:54 +03:00 · 2009-05-22 10:50:20 +03:00 · 2009-04-14 12:58:09 +03:00 · 2009-03-31 08:17:24 +03:00
56 changed files with 1141 additions and 1634 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.dependencies
+*.o
+*.so
+*~
+po/*.pot
+po/*.mo
--- a/63
+++ b/63
@@ -34,7 +34,7 @@ VDR Plugin 'iptv' Revision History
 2008-01-20: Version 0.0.6

 - Fixed some lint warnings.
- Added Italian translation (Thanks to Gringo).
+- Added Italian translation (Thanks to Diego Pierotto).
 - Added '-Wno-parentheses' to the compiler options.
 - Mapped 'kInfo' as help key in setup menu.
 - Refactored statistic collecting code.
@@ -43,9 +43,68 @@ VDR Plugin 'iptv' Revision History

 - Updated for vdr-1.5.15.
 - Replaced asprintf with cString.
- Updated French translation (Thanks to Micha<EFBFBD>l Nival).
+- Updated French translation (Thanks to Michaël Nival).
 - Modified VDR locale support detection.
 - Added preliminary automatic Pid scanning functionality.
 - Modified channels.conf format to enable/disable channel
  specific pid and sid scanning functionality.
 - Removed the general sid scanning setup option.
+
+2008-03-27: Version 0.2.0
+
+- Updated for vdr-1.6.0.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Added Russian translation (Thanks to Alexander Gross).
+
+2008-06-20: Version 0.2.1
+
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Removed compatibility mode for old channels.conf format.
+- Updated vlc2iptv script for new channels.conf format.
+- Added pluginparam patch for vdr-1.7.0.
+- Added new example scripts from VDR-WIKI.
+
+2008-10-12: Version 0.2.2
+
+- Converted HISTORY and fi_FI.po to UTF-8.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Tweaked pid scanner parameters for HD broadcasts.
+- Fixed opening of fifo tap.
+- Updated iptvstream.sh script to support optional video resolution
+  settings.
+- Optimized streamer thread termination.
+
+2008-12-16: Version 0.2.3
+
+- Updated for vdr-1.7.2.
+- Silenced a compilation warning.
+
+2009-02-25: Version 0.2.4
+
+- Updated for vdr-1.7.4.
+- Fixed blacklisting of PAT section filter.
+- Set max IPTV device count to VDR's max devices.
+- Fixed a possible crash in sid and pid scanners.
+
+2009-03-08: Version 0.2.5
+
+- Optimized TS packet data flow.
+- Refactored section filter class.
+- Cleaned up example scripts.
+- Fixed pid scanner to set the existing video stream type
+  (Thanks to ua0lnj for reporting this one).
+- Added optional patches to disable CA updates.
+
+2009-03-22: Version 0.2.6
+
+- Added a note about recommended frequencies into README.
+- Fixed a locking bug with section filters.
+- Fixed some lint warnings.
+
+2009-06-01: Version 0.3.0
+
+- Added iptvstream-notrap.sh script.
+- Fixed setting parameters when protocol changes
+  (Thanks to Peter Holik for reporting this one).
+- Updated example scripts to use ffmpeg's direct UDP output
+  and added a new "image.sh" script (Thanks to Peter Holik).
--- a/50
+++ b/50
@@ -1,7 +1,6 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for IPTV plugin
 #
-# $Id: Makefile,v 1.26 2008/01/30 22:41:58 rahrenbe Exp $

 # Debugging on/off 
 #IPTV_DEBUG = 1
@@ -24,7 +23,7 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
 ### The C++ compiler and options:

 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses

 ### The directory environment:

@@ -39,11 +38,6 @@ TMPDIR = /tmp
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):

 APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
-APIVERSNUM = $(shell sed -ne '/define APIVERSNUM/s/^.*APIVERSNUM[ \t]*\([0-9]*\).*$$/\1/p' $(VDRDIR)/config.h)
-
-### Test whether VDR has locale support
-#VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
-VDRLOCALE = $(shell if [ $(APIVERSNUM) -ge 10507 ]; then echo "locale"; fi)

 ### The name of the distribution archive:

@@ -60,11 +54,14 @@ ifdef IPTV_DEBUG
 DEFINES += -DDEBUG
 endif

+.PHONY: all all-redirect
+all-redirect: all
+
 ### The object files (add further files here):

 OBJS = $(PLUGIN).o config.o setup.o device.o streamer.o protocoludp.o \
 	protocolhttp.o protocolfile.o protocolext.o sectionfilter.o \
-	sidscanner.o pidscanner.o statistics.o common.o socket.o i18n.o
+	sidscanner.o pidscanner.o statistics.o common.o socket.o

 ### The main target:

@@ -80,7 +77,7 @@ all: libvdr-$(PLUGIN).so i18n
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(subst i18n.c,,$(OBJS:%.o=%.c)) > $@
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@

 -include $(DEPFILE)

@@ -91,20 +88,11 @@ LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
 I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
-ifeq ($(strip $(APIVERSION)),1.5.7)
-I18Nvdrmo = $(PLUGIN).mo
-else
-I18Nvdrmo = vdr-$(PLUGIN).mo
-endif
-
-### Do gettext based i18n stuff
-
-ifneq ($(strip $(VDRLOCALE)),)

 %.mo: %.po
 	msgfmt -c -o $@ $<

-$(I18Npot): $(subst i18n.c,,$(wildcard *.c))
+$(I18Npot): $(wildcard *.c)
 	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $^

 %.po: $(I18Npot)
@@ -116,23 +104,7 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 	cp $< $@

 .PHONY: i18n
-i18n: $(I18Nmsgs)
-
-i18n.c: i18n-template.c 
-	@cp i18n-template.c i18n.c
-
-### Do i18n.c based i18n stuff
-
-else
-
-i18n:
-	@### nothing to do
-
-#i18n compatibility generator:
-i18n.c: i18n-template.c po2i18n.pl $(I18Npo)
-	./po2i18n.pl < i18n-template.c > i18n.c
-
-endif 
+i18n: $(I18Nmsgs) $(I18Npot)

 ### Targets:

@@ -147,9 +119,9 @@ dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) --exclude CVS $(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@echo Distribution package created as $(PACKAGE).tgz

 clean:
-	@-rm -f $(OBJS) $(DEPFILE) i18n.c *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
--- a/39
+++ b/39
@@ -3,8 +3,8 @@ This is an IPTV plugin for the Video Disk Recorder (VDR).
 Written by:                  Rolf Ahrenberg
                             < R o l f . A h r e n b e r g @ s c i . f i >

-                             Antti Sepp<EFBFBD>l<EFBFBD>
-                             <a j h s e p p a @ n i k s u l a . h u t . f i >
+                             Antti Seppälä
+                             < a . s e p p a l a @ g m a i l . c o m >

 Project's homepage:          http://www.saunalahti.fi/~rahrenbe/vdr/iptv/

@@ -44,10 +44,7 @@ cd /put/your/path/here/VDR/PLUGINS/src
 tar -xzf /put/your/path/here/vdr-iptv-X.Y.Z.tgz
 ln -s iptv-X.Y.Z iptv
 cd /put/your/path/here/VDR
-# Note: pluginparam patch is required for every vdr
 patch -p1 < PLUGINS/src/iptv/patches/vdr-X.Y.Z-pluginparam.patch
-# Note: closefilter patch is required only for vdr-1.5.9 or earlier
-patch -p1 < PLUGINS/src/iptv/patches/vdr-X.Y.Z-closefilter.patch
 cp sources.conf /path/to/vdrconf/
 cp -R PLUGINS/src/iptv/iptv /path/to/vdrconf/plugins/
 make
@@ -114,17 +111,17 @@ Configuration:

 - channels.conf

-  TV4;IPTV:4:IPTV|S1P0|EXT|iptvstream.sh|0:P:0:0:680:0:0:4:0:0:0
-  TV3;IPTV:3:IPTV|S0P1|FILE|/video/stream.ts|5:P:0:514:670:2321:0:3:0:0:0
-  TV2;IPTV:2:IPTV|S0P1|HTTP|127.0.0.1/TS/2|3000:P:0:513:660:2321:0:2:0:0:0
-  TV1;IPTV:1:IPTV|S1P0|UDP|127.0.0.1|1234:P:0:512:650:2321:0:1:0:0:0
-           ^ ^    ^    ^   ^         ^    ^
-           | |    |    |   |         |    Source type ("P")
-           | |    |    |   |         IP Port Number, File delay (ms), Script parameter
-           | |    |    |   IP Address, File location, Script location
-           | |    |    Protocol ("UDP", "HTTP", "FILE", "EXT")
-           | |    Parameters ("S" Sid scan, "P" Pid scan, "0" disable, "1" enable)
-           | Plugin ID ("IPTV")
+  TV4;IPTV:40:IPTV|S1P0|EXT|iptvstream.sh|0:P:0:0:680:0:0:4:0:0:0
+  TV3;IPTV:30:IPTV|S0P1|FILE|/video/stream.ts|5:P:0:514:670:2321:0:3:0:0:0
+  TV2;IPTV:20:IPTV|S0P1|HTTP|127.0.0.1/TS/2|3000:P:0:513:660:2321:0:2:0:0:0
+  TV1;IPTV:10:IPTV|S1P0|UDP|127.0.0.1|1234:P:0:512:650:2321:0:1:0:0:0
+           ^  ^    ^    ^   ^         ^    ^
+           |  |    |    |   |         |    Source type ("P")
+           |  |    |    |   |         IP Port Number, File delay (ms), Script parameter
+           |  |    |    |   IP Address, File location, Script location
+           |  |    |    Protocol ("UDP", "HTTP", "FILE", "EXT")
+           |  |    Parameters ("S" Sid scan, "P" Pid scan, "0" disable, "1" enable)
+           |  Plugin ID ("IPTV")
           Unique enumeration

 - UDP multicast rules for iptables firewall
@@ -170,10 +167,16 @@ Notes:
  startup. If the fifo is found and succesfully opened, the device writes
  the current data stream into it. This can be used for debugging purposes.

+- Multiple channels with identical service id should have frequency
+  difference of 4 or greater. It's recommended to use frequencies in decades
+  (10, 20, 30, 40, ...) for all IPTV channel entries.
+
+- VLC processes won't get killed on some setups with the provided iptvstream.sh
+  script and the iptvstream-notrap.sh script should be used instead in these
+  cases.
+
 Acknowledgements:

 - The IPTV section filtering code is derived from Linux kernel.

 - The pid scanning code is derived from Udo Richter's streamplayer plugin.
-
- Udo Richter's po2i18n package is used to support VDR's old i18n system.
--- a/common.c
+++ b/common.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: common.c,v 1.10 2008/01/30 21:57:33 rahrenbe Exp $
 */

 #include <vdr/tools.h>
--- a/common.h
+++ b/common.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: common.h,v 1.20 2008/02/17 19:18:47 rahrenbe Exp $
 */

 #ifndef __IPTV_COMMON_H
--- a/config.c
+++ b/config.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: config.c,v 1.21 2008/02/01 21:54:24 rahrenbe Exp $
 */

 #include "config.h"
@@ -11,14 +10,13 @@
 cIptvConfig IptvConfig;

 cIptvConfig::cIptvConfig(void)
-: readBufferTsCount(48),
-  tsBufferSize(2),
+: tsBufferSize(2),
  tsBufferPrefillRatio(0),
  extProtocolBasePort(4321),
  useBytes(1),
  sectionFiltering(1)
 {
-  for (unsigned int i = 0; i < ARRAY_SIZE(disabledFilters) - 1; ++i)
+  for (unsigned int i = 0; i < ARRAY_SIZE(disabledFilters); ++i)
      disabledFilters[i] = -1;
  memset(configDirectory, '\0', sizeof(configDirectory));
 }
@@ -26,7 +24,7 @@ cIptvConfig::cIptvConfig(void)
 unsigned int cIptvConfig::GetDisabledFiltersCount(void) const
 {
  unsigned int n = 0;
-  while ((disabledFilters[n] != -1) && (n < ARRAY_SIZE(disabledFilters) - 1))
+  while ((n < ARRAY_SIZE(disabledFilters) && (disabledFilters[n] != -1)))
        n++;
  return n;
 }
--- a/config.h
+++ b/config.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: config.h,v 1.20 2008/02/01 21:54:24 rahrenbe Exp $
 */

 #ifndef __IPTV_CONFIG_H
@@ -15,7 +14,6 @@
 class cIptvConfig
 {
 private:
-  unsigned int readBufferTsCount;
  unsigned int tsBufferSize;
  unsigned int tsBufferPrefillRatio;
  unsigned int extProtocolBasePort;
@@ -26,7 +24,6 @@ private:

 public:
  cIptvConfig();
-  unsigned int GetReadBufferTsCount(void) const { return readBufferTsCount; }
  unsigned int GetTsBufferSize(void) const { return tsBufferSize; }
  unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatio; }
  unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePort; }
--- a/device.c
+++ b/device.c
@@ -3,15 +3,14 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: device.c,v 1.84 2008/02/17 19:18:47 rahrenbe Exp $
 */

 #include "config.h"
 #include "device.h"

-#define IPTV_MAX_DEVICES 8
+#define IPTV_MAX_DEVICES MAXDEVICES

-cIptvDevice * IptvDevices[IPTV_MAX_DEVICES] = { NULL };
+static cIptvDevice * IptvDevices[IPTV_MAX_DEVICES] = { NULL };

 unsigned int cIptvDevice::deviceCount = 0;

@@ -21,20 +20,20 @@ cIptvDevice::cIptvDevice(unsigned int Index)
  isPacketDelivered(false),
  isOpenDvr(false),
  sidScanEnabled(false),
-  pidScanEnabled(false),
-  mutex()
+  pidScanEnabled(false)
 {
-  debug("cIptvDevice::cIptvDevice(%d)\n", deviceIndex);
-  tsBuffer = new cRingBufferLinear(MEGABYTE(IptvConfig.GetTsBufferSize()),
-                                   (TS_SIZE * IptvConfig.GetReadBufferTsCount()),
-                                   false, "IPTV");
-  tsBuffer->SetTimeouts(100, 100);
+  unsigned int bufsize = MEGABYTE(IptvConfig.GetTsBufferSize());
+  bufsize -= (bufsize % TS_SIZE);
+  isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndex, CardIndex());
+  tsBuffer = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
+                                   *cString::sprintf("IPTV %d", deviceIndex));
+  tsBuffer->SetTimeouts(10, 10);
  ResetBuffering();
  pUdpProtocol = new cIptvProtocolUdp();
  pHttpProtocol = new cIptvProtocolHttp();
  pFileProtocol = new cIptvProtocolFile();
  pExtProtocol = new cIptvProtocolExt();
-  pIptvStreamer = new cIptvStreamer(tsBuffer, &mutex);
+  pIptvStreamer = new cIptvStreamer(tsBuffer, (100 * TS_SIZE));
  pPidScanner = new cPidScanner;
  // Initialize filter pointers
  memset(secfilters, '\0', sizeof(secfilters));
@@ -49,7 +48,7 @@ cIptvDevice::cIptvDevice(unsigned int Index)
  cString filename = cString::sprintf(IPTV_DVR_FILENAME, deviceIndex);
  stat(filename, &sb);
  if (S_ISFIFO(sb.st_mode)) {
-     dvrFd = open(filename, O_WRONLY | O_NONBLOCK);
+     dvrFd = open(filename, O_RDWR | O_NONBLOCK);
     if (dvrFd >= 0)
        dsyslog("IPTV device %d redirecting input stream to '%s'", deviceIndex, *filename);
     }
@@ -58,10 +57,8 @@ cIptvDevice::cIptvDevice(unsigned int Index)
 cIptvDevice::~cIptvDevice()
 {
  debug("cIptvDevice::~cIptvDevice(%d)\n", deviceIndex);
-#if defined(APIVERSNUM) && APIVERSNUM >= 10515
  // Stop section handler of iptv device
  StopSectionHandler();
-#endif
  DELETE_POINTER(pIptvStreamer);
  DELETE_POINTER(pUdpProtocol);
  DELETE_POINTER(pHttpProtocol);
@@ -227,30 +224,6 @@ cString cIptvDevice::GetChannelSettings(const char *IptvParam, int *Parameter, i
        return locstr;
        }
     }
-  // compatibility mode for old channels.conf format
-  else if (sscanf(IptvParam, "%a[^|]|%a[^|]|%a[^|]|%u", &tag, &proto, &loc, Parameter) == 4) {
-     cString tagstr(tag, true);
-     cString protostr(proto, true);
-     cString locstr(loc, true);
-     *SidScan = 0;
-     *PidScan = 0;
-     // check if IPTV tag
-     if (strncasecmp(*tagstr, "IPTV", 4) == 0) {
-        // check if protocol is supported and update the pointer
-        if (strncasecmp(*protostr, "UDP", 3) == 0)
-           *Protocol = pUdpProtocol;
-        else if (strncasecmp(*protostr, "HTTP", 4) == 0)
-           *Protocol = pHttpProtocol;
-        else if (strncasecmp(*protostr, "FILE", 4) == 0)
-           *Protocol = pFileProtocol;
-        else if (strncasecmp(*protostr, "EXT", 3) == 0)
-           *Protocol = pExtProtocol;
-        else
-           return NULL;
-        // return location
-        return locstr;
-        }
-     }
  return NULL;
 }

@@ -304,11 +277,12 @@ bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
     }
  sidScanEnabled = sidscan ? true : false;
  pidScanEnabled = pidscan ? true : false;
-  pIptvStreamer->Set(location, parameter, deviceIndex, protocol);
-  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
-     pSidScanner->SetChannel(Channel);
-  if (pidScanEnabled && pPidScanner)
-     pPidScanner->SetChannel(Channel);
+  if (pIptvStreamer->Set(location, parameter, deviceIndex, protocol)) {
+     if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+        pSidScanner->SetChannel(Channel);
+     if (pidScanEnabled && pPidScanner)
+        pPidScanner->SetChannel(Channel);
+     }
  return true;
 }

@@ -330,7 +304,7 @@ bool cIptvDevice::DeleteFilter(unsigned int Index)
  return false;
 }

-bool cIptvDevice::IsBlackListed(u_short Pid, u_char Tid, u_char Mask)
+bool cIptvDevice::IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const
 {
  //debug("cIptvDevice::IsBlackListed(%d) Pid=%d Tid=%02X Mask=%02X\n", deviceIndex, Pid, Tid, Mask);
  // loop through section filter table
@@ -355,11 +329,13 @@ int cIptvDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
  // Blacklist check, refuse certain filters
  if (IsBlackListed(Pid, Tid, Mask))
     return -1;
+  // Lock
+  cMutexLock MutexLock(&mutex);
  // Search the next free filter slot
  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
      if (!secfilters[i]) {
         //debug("cIptvDevice::OpenFilter(%d): Pid=%d Tid=%02X Mask=%02X Index=%d\n", deviceIndex, Pid, Tid, Mask, i);
-         secfilters[i] = new cIptvSectionFilter(i, deviceIndex, Pid, Tid, Mask);
+         secfilters[i] = new cIptvSectionFilter(deviceIndex, i, Pid, Tid, Mask);
         return secfilters[i]->GetReadDesc();
         }
      }
@@ -369,6 +345,9 @@ int cIptvDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)

 void cIptvDevice::CloseFilter(int Handle)
 {
+  // Lock
+  cMutexLock MutexLock(&mutex);
+  // Search the filter for deletion
  for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
      if (secfilters[i] && (Handle == secfilters[i]->GetReadDesc())) {
         //debug("cIptvDevice::CloseFilter(%d): %d\n", deviceIndex, Handle);
@@ -381,14 +360,13 @@ void cIptvDevice::CloseFilter(int Handle)
 bool cIptvDevice::OpenDvr(void)
 {
  debug("cIptvDevice::OpenDvr(%d)\n", deviceIndex);
-  mutex.Lock();
  isPacketDelivered = false;
  tsBuffer->Clear();
-  mutex.Unlock();
  ResetBuffering();
-  pIptvStreamer->Open();
+  if (pIptvStreamer)
+     pIptvStreamer->Open();
  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
-     pSidScanner->SetStatus(true);
+     pSidScanner->Open();
  isOpenDvr = true;
  return true;
 }
@@ -396,8 +374,8 @@ bool cIptvDevice::OpenDvr(void)
 void cIptvDevice::CloseDvr(void)
 {
  debug("cIptvDevice::CloseDvr(%d)\n", deviceIndex);
-  if (pidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
-     pSidScanner->SetStatus(false);
+  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+     pSidScanner->Close();
  if (pIptvStreamer)
     pIptvStreamer->Close();
  isOpenDvr = false;
@@ -432,7 +410,7 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
 {
  int Count = 0;
  //debug("cIptvDevice::GetTSPacket(%d)\n", deviceIndex);
-  if (!IsBuffering()) {
+  if (tsBuffer && !IsBuffering()) {
     if (isPacketDelivered) {
        tsBuffer->Del(TS_SIZE);
        isPacketDelivered = false;
@@ -454,24 +432,26 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
           }
        isPacketDelivered = true;
        Data = p;
-        // Update pid statistics 
+        // Update pid statistics
        AddPidStatistic(ts_pid(p), payload(p));
        // Send data also to dvr fifo
        if (dvrFd >= 0)
-           write(dvrFd, p, TS_SIZE);
+           Count = write(dvrFd, p, TS_SIZE);
        // Analyze incomplete streams with built-in pid analyzer
        if (pidScanEnabled && pPidScanner)
-            pPidScanner->Process(p);
+           pPidScanner->Process(p);
+        // Lock
+        cMutexLock MutexLock(&mutex);
        // Run the data through all filters
        for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
            if (secfilters[i])
-               secfilters[i]->ProcessData(p);
+               secfilters[i]->Process(p);
            }
        return true;
        }
     }
  // Reduce cpu load by preventing busylooping
-  cCondWait::SleepMs(100);
+  cCondWait::SleepMs(10);
  Data = NULL;
  return true;
 }
--- a/device.h
+++ b/device.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: device.h,v 1.39 2008/02/17 19:18:47 rahrenbe Exp $
 */

 #ifndef __IPTV_DEVICE_H
@@ -75,7 +74,7 @@ private:
  void ResetBuffering(void);
  bool IsBuffering(void);
  bool DeleteFilter(unsigned int Index);
-  bool IsBlackListed(u_short Pid, u_char Tid, u_char Mask);
+  bool IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const;

  // for channel selection
 public:
--- a/i18n-template.c
+++ b/i18n-template.c
@@ -1,18 +0,0 @@
-/*
- * i18n.c: IPTV plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n-template.c,v 1.1 2007/10/28 16:22:44 rahrenbe Exp $
- */
-
-#include "common.h"
-#include "i18n.h"
-
-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-const tI18nPhrase IptvPhrases[] = {
-// START I18N
-// END I18N
-  { NULL }
-  };
-#endif
--- a/i18n.h
+++ b/i18n.h
@@ -1,18 +0,0 @@
-/*
- * i18n.h: IPTV plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n.h,v 1.1 2007/10/28 16:22:44 rahrenbe Exp $
- */
-
-#ifndef __IPTV_I18N_H
-#define __IPTV_I18N_H
-
-#include <vdr/i18n.h>
-
-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-extern const tI18nPhrase IptvPhrases[];
-#endif
-
-#endif // __IPTV_I18N_H
--- a/iptv.c
+++ b/iptv.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: iptv.c,v 1.36 2008/02/01 21:54:24 rahrenbe Exp $
 */

 #include <getopt.h>
@@ -12,17 +11,16 @@
 #include "config.h"
 #include "setup.h"
 #include "device.h"
-#include "i18n.h"

 #ifndef PLUGINPARAMPATCHVERSNUM
 #error "You must apply the pluginparam patch for VDR!"
 #endif

-#if defined(APIVERSNUM) && APIVERSNUM < 10510 && !defined(CLOSEFILTERPATCHVERSNUM)
-#error "You must apply the closefilter patch for VDR!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10600
+#error "VDR-1.6.0 API version or greater is required!"
 #endif

-static const char VERSION[]     = "0.0.7";
+static const char VERSION[]     = "0.3.0";
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");

 class cPluginIptv : public cPlugin {
@@ -80,7 +78,7 @@ bool cPluginIptv::ProcessArgs(int argc, char *argv[])
  // Implement command line argument processing here if applicable.
  static const struct option long_options[] = {
    { "devices", required_argument, NULL, 'd' },
-    { NULL }
+    { NULL, 0, NULL, 0 }
    };

  int c;
@@ -100,9 +98,6 @@ bool cPluginIptv::Initialize(void)
 {
  debug("cPluginIptv::Initialize()\n");
  // Initialize any background activities the plugin shall perform.
-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-  RegisterI18n(IptvPhrases);
-#endif
  IptvConfig.SetConfigDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
  return cIptvDevice::Initialize(deviceCount);
 }
--- a/iptv/image.sh
+++ b/iptv/image.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+set -e
+
+# image.sh is used by the VDR iptv plugin to transcode images from
+# a web server to provide a video stream.
+#
+# The script originates from Peter Holik
+#
+# Example channels.conf entries:
+# Energy;IPTV:50:IPTV|S0P0|EXT|png.sh|1:P:0:256:257:0:0:3:0:0:0
+# Temperature;IPTV:60:IPTV|S0P0|EXT|png.sh|2:P:0:256:257:0:0:3:0:0:0
+# Temperature Week;IPTV:70:IPTV|S0P0|EXT|png.sh|3:P:0:256:257:0:0:3:0:0:0
+# Server Temperature;IPTV:80:IPTV|S0P0|EXT|png.sh|4:P:0:256:257:0:0:3:0:0:0
+# Server Temperature Week;IPTV:90:IPTV|S0P0|EXT|png.sh|5:P:0:256:257:0:0:3:0:0:0
+# Traffic;IPTV:100:IPTV|S0P0|EXT|png.sh|6:P:0:256:257:0:0:3:0:0:0
+#
+# webcam.sh 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 package 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 package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+case ${1} in
+    1)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=energy;type=electricity"
+        ;;
+    2)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=temp;type=temperature;type_instance=Outdoor"
+        ;;
+    3)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=temp;type=temperature;type_instance=Outdoor;begin=-604800"
+        ;;
+    4)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=temp;type=temperature;type_instance=Server"
+        ;;
+    5)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=temp;type=temperature;type_instance=Server;begin=-604800"
+        ;;
+    6)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=interface;type=if_octets;type_instance=ppp0"
+        ;;
+    *)
+        URL=""  # Default URL - TODO get dummy picture
+        ;;
+esac
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream temporary files
+IMAGE=/tmp/image.png
+LOG=/dev/null
+
+{
+# Using wget because ffmpeg cannot handle http/1.1 "Transfer-Encoding: chunked"
+wget -q -O "${IMAGE}" "${URL}"
+
+# Build stream from audiodump with cycle image as video
+# PID 0x100/256 = Video 0x101/257 = Audio
+exec ffmpeg -v 10 \
+  -analyzeduration 0 \
+  -loop_input \
+  -i "${IMAGE}" \
+  -f mpegts -r 25 -vcodec mpeg2video -b 4000k -s 664x540 -padleft 20 -padright 20 -padtop 16 -padbottom 20 \
+  -an \
+  "udp://127.0.0.1:${PORT}?pkt_size=16356"
+} > ${LOG} 2>&1
--- a/iptv/internetradio.sh
+++ b/iptv/internetradio.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# internetradio.sh is used by the VDR iptv plugin to transcode an internet
+# radio stream.
+#
+# The script originates from:
+# http://www.vdr-wiki.de/wiki/index.php/Iptv-plugin
+#
+# An example channels.conf entry:
+# internetradio;IPTV:2:IPTV|S0P0|EXT|internetradio.sh|0:P:0:0:256:0:0:2:0:0:0
+#
+# internetradio.sh 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 package 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 package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream configuration
+URL="mms://stream"
+TITLE="internetradio"
+
+# Stream temporary files
+FIFO=/tmp/internetradio.fifo
+LOG=/dev/null
+
+{
+rm -f "${FIFO}"
+mkfifo "${FIFO}"
+
+mplayer -dumpstream "${URL}" \
+  -quiet -nolirc -noautosub -noconsolecontrols -novideo -nojoystick \
+  -dumpfile "$FIFO" &
+
+# Time to connect and fill pipe
+sleep 3 
+
+# Build audio only stream
+# PID 0x100/256 = Audio
+ffmpeg -v -1 \
+  -i "${FIFO}" \
+  -title "${TITLE}" \
+  -f mpegts -acodec mp2 -ac 2 -ab 96k -ar 48000 \
+  "udp://127.0.0.1:${PORT}?pkt_size=16356"
+
+rm -f "${FIFO}"
+} > ${LOG} 2>&1
--- a/iptv/iptvstream-notrap.sh
+++ b/iptv/iptvstream-notrap.sh
@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# iptvstream.sh can be used by the VDR iptv plugin to transcode external
+# sources
+#
+# (C) 2007 Rolf Ahrenberg, Antti Seppälä
+#
+# iptvstream.sh 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 package 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 package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Default settings for stream transcoding
+VCODEC=mp2v
+VBITRATE=2400
+ACODEC=mpga
+ABITRATE=320
+
+# There is a way to specify multiple URLs in the same script. The selection is
+# then controlled by the extra parameter passed by IPTV plugin to the script
+case ${PARAMETER} in
+    1)
+        URL=""
+        WIDTH=720
+        HEIGHT=576
+        ;;
+    2)
+        URL=""
+        ;;
+    3)
+        URL=""
+        ;;
+    *)
+        URL=""  # Default URL
+        ;;
+esac
+
+if [ -z "${URL}" ]; then
+    logger "$0: error: URL not defined!"
+    exit 1
+fi
+
+# Create transcoding options
+TRANSCODE_OPTS="vcodec=${VCODEC},acodec=${ACODEC},vb=${VBITRATE},ab=${ABITRATE}"
+if [ -n "${WIDTH}" -a -n "${HEIGHT}" ] ; then
+    TRANSCODE_OPTS="${TRANSCODE_OPTS},width=${WIDTH},height=${HEIGHT}"
+fi
+
+# Create unique pids for the stream
+let VPID=${PARAMETER}+1
+let APID=${PARAMETER}+2
+let SPID=${PARAMETER}+3
+
+# Execute VLC
+exec vlc "${URL}" --sout "#transcode{${TRANSCODE_OPTS}}:standard{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}" --intf dummy
--- a/iptv/iptvstream.sh
+++ b/iptv/iptvstream.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# iptvstream.sh can be used by the VDR iptv plug-in to transcode external
+# iptvstream.sh can be used by the VDR iptv plugin to transcode external
 # sources
 #
-# (C) 2007 Rolf Ahrenberg, Antti Sepp<EFBFBD>l<EFBFBD>
+# (C) 2007 Rolf Ahrenberg, Antti Seppälä
 #
 # iptvstream.sh is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@

 if [ $# -ne 2 ]; then
    logger "$0: error: Invalid parameter count '$#' $*"
-    exit 1;
+    exit 1
 fi

 # Channels.conf parameter
@@ -31,30 +31,40 @@ PARAMETER=${1}
 # Iptv plugin listens this port
 PORT=${2}

-# Default bitrates for stream transcoding
+# Default settings for stream transcoding
+VCODEC=mp2v
 VBITRATE=2400
+ACODEC=mpga
 ABITRATE=320

 # There is a way to specify multiple URLs in the same script. The selection is
 # then controlled by the extra parameter passed by IPTV plugin to the script
 case ${PARAMETER} in
    1)
-	URL=""
-	;;
+        URL=""
+        WIDTH=720
+        HEIGHT=576
+        ;;
    2)
-	URL=""
-	;;
+        URL=""
+        ;;
    3)
-	URL=""
-	;;
+        URL=""
+        ;;
    *)
-	URL=""  # Default URL
-	;;
+        URL=""  # Default URL
+        ;;
 esac

 if [ -z "${URL}" ]; then
    logger "$0: error: URL not defined!"
-    exit 1;
+    exit 1
+fi
+
+# Create transcoding options
+TRANSCODE_OPTS="vcodec=${VCODEC},acodec=${ACODEC},vb=${VBITRATE},ab=${ABITRATE}"
+if [ -n "${WIDTH}" -a -n "${HEIGHT}" ] ; then
+    TRANSCODE_OPTS="${TRANSCODE_OPTS},width=${WIDTH},height=${HEIGHT}"
 fi

 # Create unique pids for the stream
@@ -63,7 +73,7 @@ let APID=${PARAMETER}+2
 let SPID=${PARAMETER}+3

 # Capture VLC pid for further management in IPTV plugin
-vlc "${URL}" --sout "#transcode{vcodec=mp2v,acodec=mpga,vb=${VBITRATE},ab=${ABITRATE}}:standard{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}" --intf dummy &
+vlc "${URL}" --sout "#transcode{${TRANSCODE_OPTS}}:standard{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}" --intf dummy &

 PID=${!}

--- a/iptv/linein.sh
+++ b/iptv/linein.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# linein.sh is used by the VDR iptv plugin to transcode line-in of
+# a soundcard.
+#
+# The script originates from:
+# http://www.vdr-wiki.de/wiki/index.php/Iptv-plugin
+#
+# An example channels.conf entry:
+# linein;IPTV:5:IPTV|S0P0|EXT|linein.sh|0:P:27500:0:256:0:0:5:5:5:0
+#
+# linein.sh 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 package 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 package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream configuration
+TITLE="linein"
+
+# Stream temporary files
+LOG=/dev/null
+
+{
+# PID 0x100/256 = Audio
+arecord -q -D hw:0,0 -f dat | \
+ffmpeg -v -1 \
+  -f wav \
+  -i - \
+  -title "${TITLE}" \
+  -f mpegts -acodec mp2 -ac 2 -ab 128k -ar 48000 \
+  "udp://127.0.0.1:${PORT}?pkt_size=16356"
+} > ${LOG} 2>&1
--- a/iptv/vlc2iptv
+++ b/iptv/vlc2iptv
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# vlc2iptv is used by the VDR iptv plug-in to transcode external sources
+# vlc2iptv is used by the VDR iptv plugin to transcode external sources
 #
-# (C) 2007 Rolf Ahrenberg, Antti Sepp<EFBFBD>l<EFBFBD>
+# (C) 2007 Rolf Ahrenberg, Antti Seppälä
 # (C) 2007 Tobias Grimm
 #
 # vlc2iptv is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@ AUDIO_BITRATE=320
 exit_with_error()
 {
    logger "vlc2iptv: error: $*"
-    exit 1;
+    exit 1
 }

 read_arguments()
@@ -52,7 +52,7 @@ lookup_channel_and_pids()
    [ ! -e "$CHANNELS_CONF" ] && \
      exit_with_error "channels.conf not found ($CHANNELS_CONF)"

-    local CHANNEL_RECORD=`grep ":IPTV|EXT|vlc2iptv|$PARAMETER:" $CHANNELS_CONF`
+    local CHANNEL_RECORD=`grep "[:]IPTV[|][SP][10][SP][10][|]EXT[|]vlc2iptv[|]$PARAMETER[:]" $CHANNELS_CONF`
    [ -z "$CHANNEL_RECORD" ] && \
      exit_with_error "no iptv channel with parameter $PARAMETER found"

--- a/iptv/webcam.sh
+++ b/iptv/webcam.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# webcam.sh is used by the VDR iptv plugin to transcode an internet radio
+# stream remuxed with images (e.g. webcam) to provide a video stream.
+#
+# The script originates from:
+# http://www.vdr-wiki.de/wiki/index.php/Iptv-plugin
+#
+# An example channels.conf entry:
+# webcam;IPTV:3:IPTV|S0P0|EXT|webcam.sh|0:P:0:256:257:0:0:3:0:0:0
+#
+# webcam.sh 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 package 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 package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream configuration
+URL="http://stream.address"
+IMAGE="image.jpg"
+TITLE="webcam"
+
+# Stream temporary files
+FIFO=/tmp/webcam.fifo
+LOG=/dev/null
+
+{
+rm -f "${FIFO}"
+mkfifo "${FIFO}"
+
+mplayer -dumpstream "${URL}" \
+  -quiet -nolirc -noautosub -noconsolecontrols -novideo -nojoystick \
+  -dumpfile "${FIFO}" &
+
+# Time to connect and fill pipe
+sleep 3 
+
+# Build stream from audiodump with cycle image as video
+# PID 0x100/256 = Video 0x101/257 = Audio
+ffmpeg -v -1 \
+  -i "${FIFO}" -r 0.5 -loop_input -i '${IMAGE}' \
+  -title "${TITLE}" \
+  -f mpegts -intra -r 24 -vcodec mpeg2video -b 500k -s 352x288 \
+  -acodec mp2 -ac 2 -ab 96k -ar 48000 \
+  "udp://127.0.0.1:${PORT}?pkt_size=16356"
+
+rm -f "${FIFO}"
+} > ${LOG} 2>&1
--- a/patches/vdr-1.4.7-closefilter.patch
+++ b/patches/vdr-1.4.7-closefilter.patch
@@ -1,80 +0,0 @@
-diff -Nru vdr-1.4.7-vanilla/config.h vdr-1.4.7-closefilter/config.h
--- vdr-1.4.7-vanilla/config.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/config.h	2007-10-27 01:39:43.000000000 +0300
-@@ -29,6 +29,8 @@
- #define APIVERSION  "1.4.5"
- #define APIVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
- 
-+#define CLOSEFILTERPATCHVERSNUM 1
-+
- // When loading plugins, VDR searches them by their APIVERSION, which
- // may be smaller than VDRVERSION in case there have been no changes to
- // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.4.7-vanilla/device.c vdr-1.4.7-closefilter/device.c
--- vdr-1.4.7-vanilla/device.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/device.c	2007-10-27 01:37:34.000000000 +0300
-@@ -509,6 +509,11 @@
-   return -1;
- }
- 
-+void cDevice::CloseFilter(int Handle)
-+{
-+  close(Handle);
-+}
-+
- void cDevice::AttachFilter(cFilter *Filter)
- {
-   if (sectionHandler)
-diff -Nru vdr-1.4.7-vanilla/device.h vdr-1.4.7-closefilter/device.h
--- vdr-1.4.7-vanilla/device.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/device.h	2007-10-27 01:37:19.000000000 +0300
-@@ -302,6 +302,11 @@
-        ///< Opens a file handle for the given filter data.
-        ///< A derived device that provides section data must
-        ///< implement this function.
-+  virtual void CloseFilter(int Handle);
-+       ///< Closes a file handle that has previously been opened
-+       ///< by OpenFilter(). If this is as simple as calling close(Handle),
-+       ///< a derived class need not implement this function, because this
-+       ///< is done by the default implementation.
-   void AttachFilter(cFilter *Filter);
-        ///< Attaches the given filter to this device.
-   void Detach(cFilter *Filter);
-diff -Nru vdr-1.4.7-vanilla/dvbdevice.c vdr-1.4.7-closefilter/dvbdevice.c
--- vdr-1.4.7-vanilla/dvbdevice.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/dvbdevice.c	2007-10-27 01:37:50.000000000 +0300
-@@ -726,6 +726,11 @@
-   return -1;
- }
- 
-+void cDvbDevice::CloseFilter(int Handle)
-+{
-+  close(Handle);
-+}
-+
- void cDvbDevice::TurnOffLiveMode(bool LiveView)
- {
-   if (LiveView) {
-diff -Nru vdr-1.4.7-vanilla/dvbdevice.h vdr-1.4.7-closefilter/dvbdevice.h
--- vdr-1.4.7-vanilla/dvbdevice.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/dvbdevice.h	2007-10-27 01:37:59.000000000 +0300
-@@ -79,6 +79,7 @@
- 
- protected:
-   virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
-+  virtual void CloseFilter(int Handle);
- 
- // Image Grab facilities
- 
-diff -Nru vdr-1.4.7-vanilla/sections.c vdr-1.4.7-closefilter/sections.c
--- vdr-1.4.7-vanilla/sections.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/sections.c	2007-10-27 01:34:06.000000000 +0300
-@@ -105,7 +105,7 @@
-   for (fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) {
-       if (fh->filterData.Is(FilterData->pid, FilterData->tid, FilterData->mask)) {
-          if (--fh->used <= 0) {
-            close(fh->handle);
-+            device->CloseFilter(fh->handle);
-             filterHandles.Del(fh);
-             break;
-             }
--- a/patches/vdr-1.4.7-pluginparam.patch
+++ b/patches/vdr-1.4.7-pluginparam.patch
@@ -1,299 +0,0 @@
-diff -Nru vdr-1.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c
--- vdr-1.4.7-vanilla/channels.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/channels.c	2007-10-27 01:09:05.000000000 +0300
-@@ -166,6 +166,7 @@
-   shortName = strdup("");
-   provider = strdup("");
-   portalName = strdup("");
-+  pluginParam = strdup("");
-   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-   inversion    = INVERSION_AUTO;
-   bandwidth    = BANDWIDTH_AUTO;
-@@ -187,6 +188,7 @@
-   shortName = NULL;
-   provider = NULL;
-   portalName = NULL;
-+  pluginParam = NULL;
-   schedule     = NULL;
-   linkChannels = NULL;
-   refChannel   = NULL;
-@@ -215,6 +217,7 @@
-   free(shortName);
-   free(provider);
-   free(portalName);
-+  free(pluginParam);
- }
- 
- cChannel& cChannel::operator= (const cChannel &Channel)
-@@ -223,6 +226,7 @@
-   shortName = strcpyrealloc(shortName, Channel.shortName);
-   provider = strcpyrealloc(provider, Channel.provider);
-   portalName = strcpyrealloc(portalName, Channel.portalName);
-+  pluginParam = strcpyrealloc(pluginParam, Channel.pluginParam);
-   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
-   return *this;
- }
-@@ -280,9 +284,26 @@
-      transmission = Channel->transmission;
-      guard        = Channel->guard;
-      hierarchy    = Channel->hierarchy;
-+     if (IsPlug())  pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam);
-      }
- }
- 
-+bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam)
-+{
-+  if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) {
-+       if (Number()) {
-+          dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *cSource::ToString(source), frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam);
-+          modification |= CHANNELMOD_TRANSP;
-+          Channels.SetModified();
-+          }
-+       source = Source;
-+       frequency = Frequency;
-+       pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+       schedule = NULL;
-+       }
-+    return true;
-+}
-+
- bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
- {
-   // Workarounds for broadcaster stupidity:
-@@ -407,6 +428,18 @@
-      }
- }
- 
-+void cChannel::SetPluginParam(const char *PluginParam)
-+{
-+  if (!isempty(PluginParam) && strcmp(pluginParam, PluginParam) != 0) {
-+     if (Number()) {
-+        dsyslog("changing plugin parameters of channel %d from '%s' to '%s'", Number(), pluginParam, PluginParam);
-+        modification |= CHANNELMOD_TRANSP;
-+        Channels.SetModified();
-+        }
-+     pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+     }
-+}
-+
- #define STRDIFF 0x01
- #define VALDIFF 0x02
- 
-@@ -579,7 +612,7 @@
-   if (isdigit(type))
-      type = 'S';
- #define ST(s) if (strchr(s, type))
-  char buffer[64];
-+  char buffer[256];
-   char *q = buffer;
-   *q = 0;
-   ST(" S ")  q += sprintf(q, "%c", polarization);
-@@ -591,6 +624,7 @@
-   ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
-   ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
-   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
-+  ST("P  ")  snprintf(buffer, sizeof(buffer), "%s", pluginParam);
-   return buffer;
- }
- 
-@@ -612,7 +646,7 @@
- 
- bool cChannel::StringToParameters(const char *s)
- {
-  while (s && *s) {
-+  while (s && *s && !IsPlug()) {
-         switch (toupper(*s)) {
-           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
-           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
-@@ -722,7 +756,7 @@
-         dpids[0] = 0;
-         ok = false;
-         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
-           ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
-+           ok = ((source = cSource::FromString(sourcebuf)) >= 0) && StringToParameters(parambuf);
- 
-            char *p = strchr(vpidbuf, '+');
-            if (p)
-@@ -813,6 +847,7 @@
-            shortName = strcpyrealloc(shortName, p);
-            }
-         name = strcpyrealloc(name, namebuf);
-+        if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, parambuf);
- 
-         free(parambuf);
-         free(sourcebuf);
-diff -Nru vdr-1.4.7-vanilla/channels.h vdr-1.4.7-pluginparam/channels.h
--- vdr-1.4.7-vanilla/channels.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/channels.h	2007-10-27 01:12:37.000000000 +0300
-@@ -114,6 +114,7 @@
-   char *shortName;
-   char *provider;
-   char *portalName;
-+  char *pluginParam;
-   int __BeginData__;
-   int frequency; // MHz
-   int source;
-@@ -165,6 +166,7 @@
-   int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
-   int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
-   static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
-+  const char *PluginParam(void) const { return pluginParam; }
-   int Source(void) const { return source; }
-   int Srate(void) const { return srate; }
-   int Vpid(void) const { return vpid; }
-@@ -198,6 +200,7 @@
-   int Hierarchy(void) const { return hierarchy; }
-   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
-   const cChannel *RefChannel(void) const { return refChannel; }
-+  bool IsPlug(void) const { return cSource::IsPlug(source); }
-   bool IsCable(void) const { return cSource::IsCable(source); }
-   bool IsSat(void) const { return cSource::IsSat(source); }
-   bool IsTerr(void) const { return cSource::IsTerr(source); }
-@@ -205,12 +208,14 @@
-   bool HasTimer(void) const;
-   int Modification(int Mask = CHANNELMOD_ALL);
-   void CopyTransponderData(const cChannel *Channel);
-+  bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam);
-   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
-   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
-   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
-   void SetName(const char *Name, const char *ShortName, const char *Provider);
-   void SetPortalName(const char *PortalName);
-+  void SetPluginParam(const char *PluginParam);
-   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid);
-   void SetCaIds(const int *CaIds); // list must be zero-terminated
-   void SetCaDescriptors(int Level);
-diff -Nru vdr-1.4.7-vanilla/config.h vdr-1.4.7-pluginparam/config.h
--- vdr-1.4.7-vanilla/config.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/config.h	2007-10-27 01:14:39.000000000 +0300
-@@ -29,6 +29,8 @@
- #define APIVERSION  "1.4.5"
- #define APIVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
- 
-+#define PLUGINPARAMPATCHVERSNUM 1
-+
- // When loading plugins, VDR searches them by their APIVERSION, which
- // may be smaller than VDRVERSION in case there have been no changes to
- // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.4.7-vanilla/i18n.c vdr-1.4.7-pluginparam/i18n.c
--- vdr-1.4.7-vanilla/i18n.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/i18n.c	2007-10-27 01:11:38.000000000 +0300
-@@ -6126,6 +6126,28 @@
-     "Ingen titel",
-     "Bez n<>zvu",
-   },
-+  { "Parameters",
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "Parametrit",
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+  },
-   { NULL }
-   };
- 
-diff -Nru vdr-1.4.7-vanilla/menu.c vdr-1.4.7-pluginparam/menu.c
--- vdr-1.4.7-vanilla/menu.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/menu.c	2007-10-27 01:09:05.000000000 +0300
-@@ -216,6 +216,7 @@
-   cChannel *channel;
-   cChannel data;
-   char name[256];
-+  char pluginParam[256];
-   void Setup(void);
- public:
-   cMenuEditChannel(cChannel *Channel, bool New = false);
-@@ -248,6 +249,7 @@
- 
-   // Parameters for all types of sources:
-   strn0cpy(name, data.name, sizeof(name));
-+  strn0cpy(pluginParam, data.pluginParam, sizeof(pluginParam));
-   Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name), tr(FileNameChars)));
-   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
-   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
-@@ -276,6 +278,7 @@
-   ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
-   ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
-   ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues, tr("none")));
-+  ST("P  ")  Add(new cMenuEditStrItem( tr("Parameters"),    pluginParam, sizeof(pluginParam), tr(FileNameChars)));
- 
-   SetCurrent(Get(current));
-   Display();
-@@ -290,6 +293,7 @@
-      if (Key == kOk) {
-         if (Channels.HasUniqueChannelID(&data, channel)) {
-            data.name = strcpyrealloc(data.name, name);
-+           data.pluginParam = strcpyrealloc(data.pluginParam, pluginParam);
-            if (channel) {
-               *channel = data;
-               isyslog("edited channel %d %s", channel->Number(), *data.ToText());
-diff -Nru vdr-1.4.7-vanilla/sources.c vdr-1.4.7-pluginparam/sources.c
--- vdr-1.4.7-vanilla/sources.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/sources.c	2007-10-27 01:09:20.000000000 +0300
-@@ -37,6 +37,7 @@
-   char buffer[16];
-   char *q = buffer;
-   switch (Code & st_Mask) {
-+    case stPlug:  *q++ = 'P'; break;
-     case stCable: *q++ = 'C'; break;
-     case stSat:   *q++ = 'S';
-                   {
-@@ -56,6 +57,7 @@
- {
-   int type = stNone;
-   switch (toupper(*s)) {
-+    case 'P': type = stPlug;  break;
-     case 'C': type = stCable; break;
-     case 'S': type = stSat;   break;
-     case 'T': type = stTerr;  break;
-diff -Nru vdr-1.4.7-vanilla/sources.conf vdr-1.4.7-pluginparam/sources.conf
--- vdr-1.4.7-vanilla/sources.conf	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/sources.conf	2007-10-27 01:09:20.000000000 +0300
-@@ -188,3 +188,7 @@
- # Terrestrial
- 
- T       Terrestrial
-+
-+# Plugin
-+
-+P       Plugin
-diff -Nru vdr-1.4.7-vanilla/sources.h vdr-1.4.7-pluginparam/sources.h
--- vdr-1.4.7-vanilla/sources.h	2007-10-27 01:08:40.000000000 +0300
-+++ vdr-1.4.7-pluginparam/sources.h	2007-10-27 01:09:20.000000000 +0300
-@@ -16,10 +16,11 @@
- public:
-   enum eSourceType {
-     stNone  = 0x0000,
-+    stPlug  = 0x2000,
-     stCable = 0x4000,
-     stSat   = 0x8000,
-     stTerr  = 0xC000,
-    st_Mask = 0xC000,
-+    st_Mask = 0xE000,
-     st_Neg  = 0x0800,
-     st_Pos  = 0x07FF,
-     };
-@@ -35,6 +36,7 @@
-   static cString ToString(int Code);
-   static int FromString(const char *s);
-   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
-+  static bool IsPlug(int Code) { return (Code & st_Mask) == stPlug; }
-   static bool IsCable(int Code) { return (Code & st_Mask) == stCable; }
-   static bool IsSat(int Code) { return (Code & st_Mask) == stSat; }
-   static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; }
--- a/patches/vdr-1.5.14-pluginparam.patch
+++ b/patches/vdr-1.5.14-pluginparam.patch
@@ -1,288 +0,0 @@
-diff -Nru vdr-1.5.14-vanilla/channels.c vdr-1.5.14-pluginparam/channels.c
--- vdr-1.5.14-vanilla/channels.c	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/channels.c	2008-01-28 23:32:58.000000000 +0200
-@@ -216,6 +216,7 @@
-   shortName = strdup("");
-   provider = strdup("");
-   portalName = strdup("");
-+  pluginParam = strdup("");
-   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-   inversion    = DVBFE_INVERSION_AUTO;
-   bandwidth    = DVBFE_BANDWIDTH_AUTO;
-@@ -241,6 +242,7 @@
-   shortName = NULL;
-   provider = NULL;
-   portalName = NULL;
-+  pluginParam = NULL;
-   schedule     = NULL;
-   linkChannels = NULL;
-   refChannel   = NULL;
-@@ -269,6 +271,7 @@
-   free(shortName);
-   free(provider);
-   free(portalName);
-+  free(pluginParam);
- }
- 
- cChannel& cChannel::operator= (const cChannel &Channel)
-@@ -277,6 +280,7 @@
-   shortName = strcpyrealloc(shortName, Channel.shortName);
-   provider = strcpyrealloc(provider, Channel.provider);
-   portalName = strcpyrealloc(portalName, Channel.portalName);
-+  pluginParam = strcpyrealloc(pluginParam, Channel.pluginParam);
-   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
-   return *this;
- }
-@@ -338,9 +342,27 @@
-      alpha        = Channel->alpha;
-      priority     = Channel->priority;
-      rollOff      = Channel->rollOff;
-+     if (IsPlug())  pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam);
-      }
- }
- 
-+bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam)
-+{
-+  if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) {
-+     cString OldParameters = ParametersToString();
-+     source = Source;
-+     frequency = Frequency;
-+     pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+     schedule = NULL;
-+     if (Number()) {
-+        dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *OldParameters, frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam);
-+        modification |= CHANNELMOD_TRANSP;
-+        Channels.SetModified();
-+        }
-+     }
-+  return true;
-+}
-+
- bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff)
- {
-   // Workarounds for broadcaster stupidity:
-@@ -472,6 +494,18 @@
-      }
- }
- 
-+void cChannel::SetPluginParam(const char *PluginParam)
-+{
-+  if (!isempty(PluginParam) && strcmp(pluginParam, PluginParam) != 0) {
-+     if (Number()) {
-+        dsyslog("changing plugin parameters of channel %d from '%s' to '%s'", Number(), pluginParam, PluginParam);
-+        modification |= CHANNELMOD_TRANSP;
-+        Channels.SetModified();
-+        }
-+     pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+     }
-+}
-+
- #define STRDIFF 0x01
- #define VALDIFF 0x02
- 
-@@ -658,7 +692,7 @@
-   if (isdigit(type))
-      type = 'S';
- #define ST(s) if (strchr(s, type))
-  char buffer[64];
-+  char buffer[256];
-   char *q = buffer;
-   *q = 0;
-   ST(" S ")  q += sprintf(q, "%c", polarization);
-@@ -674,6 +708,7 @@
-   ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
-   ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
-   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
-+  ST("P  ")  snprintf(buffer, sizeof(buffer), "%s", pluginParam);
-   return buffer;
- }
- 
-@@ -695,7 +730,7 @@
- 
- bool cChannel::StringToParameters(const char *s)
- {
-  while (s && *s) {
-+  while (s && *s && !IsPlug()) {
-         switch (toupper(*s)) {
-           case 'A': s = ParseParameter(s, alpha, AlphaValues); break;
-           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
-@@ -810,7 +845,7 @@
-         dpids[0] = 0;
-         ok = false;
-         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
-           ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
-+           ok = ((source = cSource::FromString(sourcebuf)) >= 0) && StringToParameters(parambuf);
- 
-            char *p = strchr(vpidbuf, '+');
-            if (p)
-@@ -901,6 +936,7 @@
-            shortName = strcpyrealloc(shortName, p);
-            }
-         name = strcpyrealloc(name, namebuf);
-+        if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, parambuf);
- 
-         free(parambuf);
-         free(sourcebuf);
-diff -Nru vdr-1.5.14-vanilla/channels.h vdr-1.5.14-pluginparam/channels.h
--- vdr-1.5.14-vanilla/channels.h	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/channels.h	2008-01-28 23:32:58.000000000 +0200
-@@ -118,6 +118,7 @@
-   char *shortName;
-   char *provider;
-   char *portalName;
-+  char *pluginParam;
-   int __BeginData__;
-   int frequency; // MHz
-   int source;
-@@ -173,6 +174,7 @@
-   int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
-   int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
-   static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
-+  const char *PluginParam(void) const { return pluginParam; }
-   int Source(void) const { return source; }
-   int Srate(void) const { return srate; }
-   int Vpid(void) const { return vpid; }
-@@ -211,6 +213,7 @@
-   int RollOff(void) const { return rollOff; }
-   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
-   const cChannel *RefChannel(void) const { return refChannel; }
-+  bool IsPlug(void) const { return cSource::IsPlug(source); }
-   bool IsCable(void) const { return cSource::IsCable(source); }
-   bool IsSat(void) const { return cSource::IsSat(source); }
-   bool IsTerr(void) const { return cSource::IsTerr(source); }
-@@ -218,12 +221,14 @@
-   bool HasTimer(void) const;
-   int Modification(int Mask = CHANNELMOD_ALL);
-   void CopyTransponderData(const cChannel *Channel);
-+  bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam);
-   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff);
-   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, int Alpha, int Priority);
-   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
-   void SetName(const char *Name, const char *ShortName, const char *Provider);
-   void SetPortalName(const char *PortalName);
-+  void SetPluginParam(const char *PluginParam);
-   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
-   void SetCaIds(const int *CaIds); // list must be zero-terminated
-   void SetCaDescriptors(int Level);
-diff -Nru vdr-1.5.14-vanilla/config.h vdr-1.5.14-pluginparam/config.h
--- vdr-1.5.14-vanilla/config.h	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/config.h	2008-01-28 23:32:58.000000000 +0200
-@@ -30,6 +30,8 @@
- #define APIVERSION  "1.5.14"
- #define APIVERSNUM   10514  // Version * 10000 + Major * 100 + Minor
- 
-+#define PLUGINPARAMPATCHVERSNUM 1
-+
- // When loading plugins, VDR searches them by their APIVERSION, which
- // may be smaller than VDRVERSION in case there have been no changes to
- // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.5.14-vanilla/menu.c vdr-1.5.14-pluginparam/menu.c
--- vdr-1.5.14-vanilla/menu.c	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/menu.c	2008-01-28 23:32:58.000000000 +0200
-@@ -155,6 +155,7 @@
-   cChannel *channel;
-   cChannel data;
-   char name[256];
-+  char pluginParam[256];
-   void Setup(void);
- public:
-   cMenuEditChannel(cChannel *Channel, bool New = false);
-@@ -187,6 +188,7 @@
- 
-   // Parameters for all types of sources:
-   strn0cpy(name, data.name, sizeof(name));
-+  strn0cpy(pluginParam, data.pluginParam, sizeof(pluginParam));
-   Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name)));
-   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
-   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
-@@ -221,6 +223,7 @@
-   ST("  T")  Add(new cMenuEditMapItem( tr("Alpha"),        &data.alpha,        AlphaValues));
-   ST("  T")  Add(new cMenuEditMapItem( tr("Priority"),     &data.priority,     PriorityValues));
-   ST(" S ")  Add(new cMenuEditMapItem( tr("Rolloff"),      &data.rollOff,      RollOffValues));
-+  ST("P  ")  Add(new cMenuEditStrItem( tr("Parameters"),    pluginParam, sizeof(pluginParam), tr(FileNameChars)));
- 
-   SetCurrent(Get(current));
-   Display();
-@@ -235,6 +238,7 @@
-      if (Key == kOk) {
-         if (Channels.HasUniqueChannelID(&data, channel)) {
-            data.name = strcpyrealloc(data.name, name);
-+           data.pluginParam = strcpyrealloc(data.pluginParam, pluginParam);
-            if (channel) {
-               *channel = data;
-               isyslog("edited channel %d %s", channel->Number(), *data.ToText());
-diff -Nru vdr-1.5.14-vanilla/po/fi_FI.po vdr-1.5.14-pluginparam/po/fi_FI.po
--- vdr-1.5.14-vanilla/po/fi_FI.po	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/po/fi_FI.po	2008-01-28 23:32:58.000000000 +0200
-@@ -1019,3 +1019,6 @@
- #, c-format
- msgid "VDR will shut down in %s minutes"
- msgstr "VDR sammuu %s minuutin kuluttua"
-+
-+msgid "Parameters"
-+msgstr "Parametrit"
-diff -Nru vdr-1.5.14-vanilla/po/fr_FR.po vdr-1.5.14-pluginparam/po/fr_FR.po
--- vdr-1.5.14-vanilla/po/fr_FR.po	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/po/fr_FR.po	2008-01-28 23:32:58.000000000 +0200
-@@ -1022,3 +1022,6 @@
- #, c-format
- msgid "VDR will shut down in %s minutes"
- msgstr "VDR s'arr<72>tera dans %s minutes"
-+
-+msgid "Parameters"
-+msgstr "Param<61>tres"
-diff -Nru vdr-1.5.14-vanilla/sources.c vdr-1.5.14-pluginparam/sources.c
--- vdr-1.5.14-vanilla/sources.c	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/sources.c	2008-01-28 23:32:58.000000000 +0200
-@@ -37,6 +37,7 @@
-   char buffer[16];
-   char *q = buffer;
-   switch (Code & st_Mask) {
-+    case stPlug:  *q++ = 'P'; break;
-     case stCable: *q++ = 'C'; break;
-     case stSat:   *q++ = 'S';
-                   {
-@@ -56,6 +57,7 @@
- {
-   int type = stNone;
-   switch (toupper(*s)) {
-+    case 'P': type = stPlug;  break;
-     case 'C': type = stCable; break;
-     case 'S': type = stSat;   break;
-     case 'T': type = stTerr;  break;
-diff -Nru vdr-1.5.14-vanilla/sources.conf vdr-1.5.14-pluginparam/sources.conf
--- vdr-1.5.14-vanilla/sources.conf	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/sources.conf	2008-01-28 23:32:58.000000000 +0200
-@@ -188,3 +188,7 @@
- # Terrestrial
- 
- T       Terrestrial
-+
-+# Plugin
-+
-+P       Plugin
-diff -Nru vdr-1.5.14-vanilla/sources.h vdr-1.5.14-pluginparam/sources.h
--- vdr-1.5.14-vanilla/sources.h	2008-01-27 23:04:26.000000000 +0200
-+++ vdr-1.5.14-pluginparam/sources.h	2008-01-28 23:32:58.000000000 +0200
-@@ -16,10 +16,11 @@
- public:
-   enum eSourceType {
-     stNone  = 0x0000,
-+    stPlug  = 0x2000,
-     stCable = 0x4000,
-     stSat   = 0x8000,
-     stTerr  = 0xC000,
-    st_Mask = 0xC000,
-+    st_Mask = 0xE000,
-     st_Neg  = 0x0800,
-     st_Pos  = 0x07FF,
-     };
-@@ -35,6 +36,7 @@
-   static cString ToString(int Code);
-   static int FromString(const char *s);
-   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
-+  static bool IsPlug(int Code) { return (Code & st_Mask) == stPlug; }
-   static bool IsCable(int Code) { return (Code & st_Mask) == stCable; }
-   static bool IsSat(int Code) { return (Code & st_Mask) == stSat; }
-   static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; }
--- a/patches/vdr-1.6.0-disable-ca-updates.patch
+++ b/patches/vdr-1.6.0-disable-ca-updates.patch
@@ -0,0 +1,11 @@
+diff -Nru vdr-1.6.0-vanilla/pat.c vdr-1.6.0-disable-ca-updates/pat.c
+--- vdr-1.6.0-vanilla/pat.c	2008-02-08 15:48:31.000000000 +0200
+++ vdr-1.6.0-disable-ca-updates/pat.c	2009-03-07 14:56:42.000000000 +0200
+@@ -440,6 +440,7 @@
+             }
+         if (Setup.UpdateChannels >= 2) {
+            Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+           if (!Channel->IsPlug())
+            Channel->SetCaIds(CaDescriptors->CaIds());
+            }
+         Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
--- a/patches/vdr-1.5.15-pluginparam.patch
+++ b/patches/vdr-1.5.15-pluginparam.patch
@@ -1,6 +1,6 @@
-diff -Nru vdr-1.5.15-vanilla/channels.c vdr-1.5.15-pluginparam/channels.c
--- vdr-1.5.15-vanilla/channels.c	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/channels.c	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/channels.c vdr-1.6.0-pluginparam/channels.c
+--- vdr-1.6.0-vanilla/channels.c	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/channels.c	2008-03-27 22:06:47.000000000 +0200
@@ -166,6 +166,7 @@
   shortName = strdup("");
   provider = strdup("");
@@ -122,9 +122,9 @@ diff -Nru vdr-1.5.15-vanilla/channels.c vdr-1.5.15-pluginparam/channels.c
 
         free(parambuf);
         free(sourcebuf);
-diff -Nru vdr-1.5.15-vanilla/channels.h vdr-1.5.15-pluginparam/channels.h
--- vdr-1.5.15-vanilla/channels.h	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/channels.h	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/channels.h vdr-1.6.0-pluginparam/channels.h
+--- vdr-1.6.0-vanilla/channels.h	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/channels.h	2008-03-27 22:06:47.000000000 +0200
@@ -114,6 +114,7 @@
   char *shortName;
   char *provider;
@@ -164,21 +164,21 @@ diff -Nru vdr-1.5.15-vanilla/channels.h vdr-1.5.15-pluginparam/channels.h
   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
-diff -Nru vdr-1.5.15-vanilla/config.h vdr-1.5.15-pluginparam/config.h
--- vdr-1.5.15-vanilla/config.h	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/config.h	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/config.h vdr-1.6.0-pluginparam/config.h
+--- vdr-1.6.0-vanilla/config.h	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/config.h	2008-03-27 22:06:47.000000000 +0200
@@ -30,6 +30,8 @@
- #define APIVERSION  "1.5.15"
- #define APIVERSNUM   10515  // Version * 10000 + Major * 100 + Minor
+ #define APIVERSION  "1.6.0"
+ #define APIVERSNUM   10600  // Version * 10000 + Major * 100 + Minor
 
 +#define PLUGINPARAMPATCHVERSNUM 1
 +
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
 // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.5.15-vanilla/menu.c vdr-1.5.15-pluginparam/menu.c
--- vdr-1.5.15-vanilla/menu.c	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/menu.c	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/menu.c vdr-1.6.0-pluginparam/menu.c
+--- vdr-1.6.0-vanilla/menu.c	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/menu.c	2008-03-27 22:06:47.000000000 +0200
@@ -253,6 +253,7 @@
   cChannel *channel;
   cChannel data;
@@ -211,9 +211,9 @@ diff -Nru vdr-1.5.15-vanilla/menu.c vdr-1.5.15-pluginparam/menu.c
            if (channel) {
               *channel = data;
               isyslog("edited channel %d %s", channel->Number(), *data.ToText());
-diff -Nru vdr-1.5.15-vanilla/po/fi_FI.po vdr-1.5.15-pluginparam/po/fi_FI.po
--- vdr-1.5.15-vanilla/po/fi_FI.po	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/po/fi_FI.po	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/po/fi_FI.po vdr-1.6.0-pluginparam/po/fi_FI.po
+--- vdr-1.6.0-vanilla/po/fi_FI.po	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/po/fi_FI.po	2008-03-27 22:06:47.000000000 +0200
@@ -1001,3 +1001,6 @@
 #, c-format
 msgid "VDR will shut down in %s minutes"
@@ -221,9 +221,9 @@ diff -Nru vdr-1.5.15-vanilla/po/fi_FI.po vdr-1.5.15-pluginparam/po/fi_FI.po
 +
 +msgid "Parameters"
 +msgstr "Parametrit"
-diff -Nru vdr-1.5.15-vanilla/po/fr_FR.po vdr-1.5.15-pluginparam/po/fr_FR.po
--- vdr-1.5.15-vanilla/po/fr_FR.po	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/po/fr_FR.po	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/po/fr_FR.po vdr-1.6.0-pluginparam/po/fr_FR.po
+--- vdr-1.6.0-vanilla/po/fr_FR.po	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/po/fr_FR.po	2008-03-27 22:06:47.000000000 +0200
@@ -1004,3 +1004,6 @@
 #, c-format
 msgid "VDR will shut down in %s minutes"
@@ -231,9 +231,9 @@ diff -Nru vdr-1.5.15-vanilla/po/fr_FR.po vdr-1.5.15-pluginparam/po/fr_FR.po
 +
 +msgid "Parameters"
 +msgstr "Paramètres"
-diff -Nru vdr-1.5.15-vanilla/sources.c vdr-1.5.15-pluginparam/sources.c
--- vdr-1.5.15-vanilla/sources.c	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/sources.c	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/sources.c vdr-1.6.0-pluginparam/sources.c
+--- vdr-1.6.0-vanilla/sources.c	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/sources.c	2008-03-27 22:06:47.000000000 +0200
@@ -37,6 +37,7 @@
   char buffer[16];
   char *q = buffer;
@@ -250,9 +250,9 @@ diff -Nru vdr-1.5.15-vanilla/sources.c vdr-1.5.15-pluginparam/sources.c
     case 'C': type = stCable; break;
     case 'S': type = stSat;   break;
     case 'T': type = stTerr;  break;
-diff -Nru vdr-1.5.15-vanilla/sources.conf vdr-1.5.15-pluginparam/sources.conf
--- vdr-1.5.15-vanilla/sources.conf	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/sources.conf	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/sources.conf vdr-1.6.0-pluginparam/sources.conf
+--- vdr-1.6.0-vanilla/sources.conf	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/sources.conf	2008-03-27 22:06:47.000000000 +0200
@@ -188,3 +188,7 @@
 # Terrestrial
 
@@ -261,9 +261,9 @@ diff -Nru vdr-1.5.15-vanilla/sources.conf vdr-1.5.15-pluginparam/sources.conf
 +# Plugin
 +
 +P       Plugin
-diff -Nru vdr-1.5.15-vanilla/sources.h vdr-1.5.15-pluginparam/sources.h
--- vdr-1.5.15-vanilla/sources.h	2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-pluginparam/sources.h	2008-02-17 19:11:29.000000000 +0200
+diff -Nru vdr-1.6.0-vanilla/sources.h vdr-1.6.0-pluginparam/sources.h
+--- vdr-1.6.0-vanilla/sources.h	2008-03-27 21:43:25.000000000 +0200
+++ vdr-1.6.0-pluginparam/sources.h	2008-03-27 22:06:47.000000000 +0200
@@ -16,10 +16,11 @@
 public:
   enum eSourceType {
--- a/patches/vdr-1.7.7-disable_ca_updates.patch
+++ b/patches/vdr-1.7.7-disable_ca_updates.patch
@@ -0,0 +1,11 @@
+diff -Nru vdr-1.7.7-vanilla/pat.c vdr-1.7.7-disable_ca_updates/pat.c
+--- vdr-1.7.7-vanilla/pat.c	2008-07-06 17:01:32.000000000 +0300
+++ vdr-1.7.7-disable_ca_updates/pat.c	2009-05-22 10:57:58.000000000 +0300
+@@ -444,6 +444,7 @@
+             }
+         if (Setup.UpdateChannels >= 2) {
+            Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+           if (!Channel->IsPlug())
+            Channel->SetCaIds(CaDescriptors->CaIds());
+            }
+         Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
--- a/patches/vdr-1.5.13-pluginparam.patch
+++ b/patches/vdr-1.5.13-pluginparam.patch
@@ -1,15 +1,15 @@
-diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
--- vdr-1.5.13-vanilla/channels.c	2007-10-12 17:40:53.000000000 +0300
-+++ vdr-1.5.13-pluginparam/channels.c	2008-01-29 22:48:22.000000000 +0200
-@@ -166,6 +166,7 @@
+diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c
+--- vdr-1.7.7-vanilla/channels.c	2009-04-25 16:57:32.000000000 +0300
+++ vdr-1.7.7-pluginparam/channels.c	2009-05-22 10:57:39.000000000 +0300
+@@ -188,6 +188,7 @@
   shortName = strdup("");
   provider = strdup("");
   portalName = strdup("");
 +  pluginParam = strdup("");
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
   inversion    = INVERSION_AUTO;
-   bandwidth    = BANDWIDTH_AUTO;
-@@ -187,6 +188,7 @@
+   bandwidth    = 8000000;
+@@ -211,6 +212,7 @@
   shortName = NULL;
   provider = NULL;
   portalName = NULL;
@@ -17,7 +17,7 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
   schedule     = NULL;
   linkChannels = NULL;
   refChannel   = NULL;
-@@ -215,6 +217,7 @@
+@@ -239,6 +241,7 @@
   free(shortName);
   free(provider);
   free(portalName);
@@ -25,7 +25,7 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
 }
 
 cChannel& cChannel::operator= (const cChannel &Channel)
-@@ -223,6 +226,7 @@
+@@ -247,6 +250,7 @@
   shortName = strcpyrealloc(shortName, Channel.shortName);
   provider = strcpyrealloc(provider, Channel.provider);
   portalName = strcpyrealloc(portalName, Channel.portalName);
@@ -33,10 +33,10 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
   return *this;
 }
-@@ -280,9 +284,26 @@
-      transmission = Channel->transmission;
+@@ -306,9 +310,26 @@
      guard        = Channel->guard;
      hierarchy    = Channel->hierarchy;
+      rollOff      = Channel->rollOff;
 +     if (IsPlug())  pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam);
      }
 }
@@ -57,10 +57,10 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
 +  return true;
 +}
 +
- bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
+ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff)
 {
   // Workarounds for broadcaster stupidity:
-@@ -407,6 +428,18 @@
+@@ -438,6 +459,18 @@
      }
 }
 
@@ -79,7 +79,7 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
 #define STRDIFF 0x01
 #define VALDIFF 0x02
 
-@@ -593,7 +626,7 @@
+@@ -632,7 +665,7 @@
   if (isdigit(type))
      type = 'S';
 #define ST(s) if (strchr(s, type))
@@ -88,33 +88,33 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
   char *q = buffer;
   *q = 0;
   ST(" S ")  q += sprintf(q, "%c", polarization);
-@@ -605,6 +638,7 @@
+@@ -646,6 +679,7 @@
+   ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
   ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
-   ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
 +  ST("P  ")  snprintf(buffer, sizeof(buffer), "%s", pluginParam);
   return buffer;
 }
 
-@@ -626,7 +660,7 @@
+@@ -674,7 +708,7 @@
 
 bool cChannel::StringToParameters(const char *s)
 {
 -  while (s && *s) {
 +  while (s && *s && !IsPlug()) {
         switch (toupper(*s)) {
+           case 'A': s = SkipDigits(s); break; // for compatibility with the "multiproto" approach - may be removed in future versions
           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
-           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
-@@ -736,7 +770,7 @@
+@@ -792,7 +826,7 @@
         dpids[0] = 0;
         ok = false;
         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
 -           ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
 +           ok = ((source = cSource::FromString(sourcebuf)) >= 0) && StringToParameters(parambuf);
 
-            char *p = strchr(vpidbuf, '+');
-            if (p)
-@@ -827,6 +861,7 @@
+            char *p;
+            if ((p = strchr(vpidbuf, '=')) != NULL) {
+@@ -887,6 +921,7 @@
            shortName = strcpyrealloc(shortName, p);
            }
         name = strcpyrealloc(name, namebuf);
@@ -122,10 +122,10 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
 
         free(parambuf);
         free(sourcebuf);
-diff -Nru vdr-1.5.13-vanilla/channels.h vdr-1.5.13-pluginparam/channels.h
--- vdr-1.5.13-vanilla/channels.h	2007-09-02 13:23:11.000000000 +0300
-+++ vdr-1.5.13-pluginparam/channels.h	2008-01-29 22:47:43.000000000 +0200
-@@ -114,6 +114,7 @@
+diff -Nru vdr-1.7.7-vanilla/channels.h vdr-1.7.7-pluginparam/channels.h
+--- vdr-1.7.7-vanilla/channels.h	2008-11-22 15:35:52.000000000 +0200
+++ vdr-1.7.7-pluginparam/channels.h	2009-05-22 10:57:39.000000000 +0300
+@@ -116,6 +116,7 @@
   char *shortName;
   char *provider;
   char *portalName;
@@ -133,7 +133,7 @@ diff -Nru vdr-1.5.13-vanilla/channels.h vdr-1.5.13-pluginparam/channels.h
   int __BeginData__;
   int frequency; // MHz
   int source;
-@@ -165,6 +166,7 @@
+@@ -171,6 +172,7 @@
   int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
   int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
   static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
@@ -141,45 +141,45 @@ diff -Nru vdr-1.5.13-vanilla/channels.h vdr-1.5.13-pluginparam/channels.h
   int Source(void) const { return source; }
   int Srate(void) const { return srate; }
   int Vpid(void) const { return vpid; }
-@@ -199,6 +201,7 @@
-   int Hierarchy(void) const { return hierarchy; }
+@@ -208,6 +210,7 @@
+   int RollOff(void) const { return rollOff; }
   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
   const cChannel *RefChannel(void) const { return refChannel; }
 +  bool IsPlug(void) const { return cSource::IsPlug(source); }
   bool IsCable(void) const { return cSource::IsCable(source); }
   bool IsSat(void) const { return cSource::IsSat(source); }
   bool IsTerr(void) const { return cSource::IsTerr(source); }
-@@ -206,12 +209,14 @@
+@@ -215,12 +218,14 @@
   bool HasTimer(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
   void CopyTransponderData(const cChannel *Channel);
 +  bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam);
-   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
+   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff);
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
 +  void SetPluginParam(const char *PluginParam);
-   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+   void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
-diff -Nru vdr-1.5.13-vanilla/config.h vdr-1.5.13-pluginparam/config.h
--- vdr-1.5.13-vanilla/config.h	2007-11-25 15:45:48.000000000 +0200
-+++ vdr-1.5.13-pluginparam/config.h	2008-01-29 22:47:43.000000000 +0200
+diff -Nru vdr-1.7.7-vanilla/config.h vdr-1.7.7-pluginparam/config.h
+--- vdr-1.7.7-vanilla/config.h	2009-05-03 16:15:35.000000000 +0300
+++ vdr-1.7.7-pluginparam/config.h	2009-05-22 10:57:39.000000000 +0300
@@ -30,6 +30,8 @@
- #define APIVERSION  "1.5.13"
- #define APIVERSNUM   10513  // Version * 10000 + Major * 100 + Minor
+ #define APIVERSION  "1.7.7"
+ #define APIVERSNUM   10707  // Version * 10000 + Major * 100 + Minor
 
 +#define PLUGINPARAMPATCHVERSNUM 1
 +
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
 // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.5.13-vanilla/menu.c vdr-1.5.13-pluginparam/menu.c
--- vdr-1.5.13-vanilla/menu.c	2008-01-13 15:59:33.000000000 +0200
-+++ vdr-1.5.13-pluginparam/menu.c	2008-01-29 22:47:43.000000000 +0200
-@@ -219,6 +219,7 @@
+diff -Nru vdr-1.7.7-vanilla/menu.c vdr-1.7.7-pluginparam/menu.c
+--- vdr-1.7.7-vanilla/menu.c	2009-05-03 16:30:13.000000000 +0300
+++ vdr-1.7.7-pluginparam/menu.c	2009-05-22 10:57:39.000000000 +0300
+@@ -190,6 +190,7 @@
   cChannel *channel;
   cChannel data;
   char name[256];
@@ -187,7 +187,7 @@ diff -Nru vdr-1.5.13-vanilla/menu.c vdr-1.5.13-pluginparam/menu.c
   void Setup(void);
 public:
   cMenuEditChannel(cChannel *Channel, bool New = false);
-@@ -251,6 +252,7 @@
+@@ -222,6 +223,7 @@
 
   // Parameters for all types of sources:
   strn0cpy(name, data.name, sizeof(name));
@@ -195,15 +195,15 @@ diff -Nru vdr-1.5.13-vanilla/menu.c vdr-1.5.13-pluginparam/menu.c
   Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name)));
   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
-@@ -281,6 +283,7 @@
-   ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
+@@ -254,6 +256,7 @@
   ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
-   ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues, tr("none")));
+   ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues));
+   ST(" S ")  Add(new cMenuEditMapItem( tr("Rolloff"),      &data.rollOff,      RollOffValues));
 +  ST("P  ")  Add(new cMenuEditStrItem( tr("Parameters"),    pluginParam, sizeof(pluginParam), tr(FileNameChars)));
 
   SetCurrent(Get(current));
   Display();
-@@ -295,6 +298,7 @@
+@@ -268,6 +271,7 @@
      if (Key == kOk) {
         if (Channels.HasUniqueChannelID(&data, channel)) {
            data.name = strcpyrealloc(data.name, name);
@@ -211,29 +211,29 @@ diff -Nru vdr-1.5.13-vanilla/menu.c vdr-1.5.13-pluginparam/menu.c
            if (channel) {
               *channel = data;
               isyslog("edited channel %d %s", channel->Number(), *data.ToText());
-diff -Nru vdr-1.5.13-vanilla/po/fi_FI.po vdr-1.5.13-pluginparam/po/fi_FI.po
--- vdr-1.5.13-vanilla/po/fi_FI.po	2008-01-13 17:06:32.000000000 +0200
-+++ vdr-1.5.13-pluginparam/po/fi_FI.po	2008-01-29 22:47:43.000000000 +0200
-@@ -1001,3 +1001,6 @@
+diff -Nru vdr-1.7.7-vanilla/po/fi_FI.po vdr-1.7.7-pluginparam/po/fi_FI.po
+--- vdr-1.7.7-vanilla/po/fi_FI.po	2009-05-03 17:15:20.000000000 +0300
+++ vdr-1.7.7-pluginparam/po/fi_FI.po	2009-05-22 10:57:39.000000000 +0300
+@@ -1010,3 +1010,6 @@
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR sammuu %s minuutin kuluttua"
 +
 +msgid "Parameters"
 +msgstr "Parametrit"
-diff -Nru vdr-1.5.13-vanilla/po/fr_FR.po vdr-1.5.13-pluginparam/po/fr_FR.po
--- vdr-1.5.13-vanilla/po/fr_FR.po	2008-01-13 17:06:32.000000000 +0200
-+++ vdr-1.5.13-pluginparam/po/fr_FR.po	2008-01-29 22:47:43.000000000 +0200
-@@ -1004,3 +1004,6 @@
+diff -Nru vdr-1.7.7-vanilla/po/fr_FR.po vdr-1.7.7-pluginparam/po/fr_FR.po
+--- vdr-1.7.7-vanilla/po/fr_FR.po	2009-05-03 17:15:20.000000000 +0300
+++ vdr-1.7.7-pluginparam/po/fr_FR.po	2009-05-22 10:57:39.000000000 +0300
+@@ -1013,3 +1013,6 @@
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR s'arrêtera dans %s minutes"
 +
 +msgid "Parameters"
 +msgstr "Paramètres"
-diff -Nru vdr-1.5.13-vanilla/sources.c vdr-1.5.13-pluginparam/sources.c
--- vdr-1.5.13-vanilla/sources.c	2004-12-26 13:58:52.000000000 +0200
-+++ vdr-1.5.13-pluginparam/sources.c	2008-01-29 22:47:43.000000000 +0200
+diff -Nru vdr-1.7.7-vanilla/sources.c vdr-1.7.7-pluginparam/sources.c
+--- vdr-1.7.7-vanilla/sources.c	2008-02-10 16:07:26.000000000 +0200
+++ vdr-1.7.7-pluginparam/sources.c	2009-05-22 10:57:39.000000000 +0300
@@ -37,6 +37,7 @@
   char buffer[16];
   char *q = buffer;
@@ -250,10 +250,10 @@ diff -Nru vdr-1.5.13-vanilla/sources.c vdr-1.5.13-pluginparam/sources.c
     case 'C': type = stCable; break;
     case 'S': type = stSat;   break;
     case 'T': type = stTerr;  break;
-diff -Nru vdr-1.5.13-vanilla/sources.conf vdr-1.5.13-pluginparam/sources.conf
--- vdr-1.5.13-vanilla/sources.conf	2007-02-17 18:15:13.000000000 +0200
-+++ vdr-1.5.13-pluginparam/sources.conf	2008-01-29 22:47:43.000000000 +0200
-@@ -188,3 +188,7 @@
+diff -Nru vdr-1.7.7-vanilla/sources.conf vdr-1.7.7-pluginparam/sources.conf
+--- vdr-1.7.7-vanilla/sources.conf	2008-08-16 13:02:27.000000000 +0300
+++ vdr-1.7.7-pluginparam/sources.conf	2009-05-22 10:57:39.000000000 +0300
+@@ -194,3 +194,7 @@
 # Terrestrial
 
 T       Terrestrial
@@ -261,9 +261,9 @@ diff -Nru vdr-1.5.13-vanilla/sources.conf vdr-1.5.13-pluginparam/sources.conf
 +# Plugin
 +
 +P       Plugin
-diff -Nru vdr-1.5.13-vanilla/sources.h vdr-1.5.13-pluginparam/sources.h
--- vdr-1.5.13-vanilla/sources.h	2005-05-14 12:30:41.000000000 +0300
-+++ vdr-1.5.13-pluginparam/sources.h	2008-01-29 22:47:43.000000000 +0200
+diff -Nru vdr-1.7.7-vanilla/sources.h vdr-1.7.7-pluginparam/sources.h
+--- vdr-1.7.7-vanilla/sources.h	2005-05-14 12:30:41.000000000 +0300
+++ vdr-1.7.7-pluginparam/sources.h	2009-05-22 10:57:39.000000000 +0300
@@ -16,10 +16,11 @@
 public:
   enum eSourceType {
--- a/pidscanner.c
+++ b/pidscanner.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: pidscanner.c,v 1.6 2008/02/02 21:06:14 rahrenbe Exp $
 */

 #include "common.h"
@@ -11,8 +10,8 @@

 #define PIDSCANNER_TIMEOUT_IN_MS   15000 /* 15s timeout for detection */
 #define PIDSCANNER_APID_COUNT      5     /* minimum count of audio pid samples for pid detection */
-#define PIDSCANNER_VPID_COUNT      10    /* minimum count of video pid samples for pid detection */
-#define PIDSCANNER_PID_DELTA_COUNT 50    /* minimum count of pid samples for audio/video only pid detection */
+#define PIDSCANNER_VPID_COUNT      5     /* minimum count of video pid samples for pid detection */
+#define PIDSCANNER_PID_DELTA_COUNT 100   /* minimum count of pid samples for audio/video only pid detection */

 cPidScanner::cPidScanner(void) 
 : timeout(0),
@@ -92,61 +91,68 @@ void cPidScanner::Process(const uint8_t* buf)
           // Stream ID
           if ((sid >= 0xC0) && (sid <= 0xDF)) {
              if (pid < Apid) {
-                 debug("Found lower Apid: 0x%X instead of 0x%X\n", pid, Apid);
+                 debug("cPidScanner::Process: Found lower Apid: 0x%X instead of 0x%X\n", pid, Apid);
                 Apid = pid;
                 numApids = 1;
                 }
              else if (pid == Apid) {
                 ++numApids;
-                 debug("Incrementing Apids, now at %d\n", numApids);
+                 debug("cPidScanner::Process: Incrementing Apids, now at %d\n", numApids);
                 }
              }
           else if ((sid >= 0xE0) && (sid <= 0xEF)) {
              if (pid < Vpid) {
-                 debug("Found lower Vpid: 0x%X instead of 0x%X\n", pid, Vpid);
+                 debug("cPidScanner::Process: Found lower Vpid: 0x%X instead of 0x%X\n", pid, Vpid);
                 Vpid = pid;
                 numVpids = 1;
                 }
              else if (pid == Vpid) {
                 ++numVpids;
-                 debug("Incrementing Vpids, now at %d\n", numVpids);
+                 debug("cPidScanner::Process: Incrementing Vpids, now at %d\n", numVpids);
                 }
              }
           }
-        if (((numVpids > PIDSCANNER_VPID_COUNT) && (numApids > PIDSCANNER_APID_COUNT)) ||
-            (abs(numApids - numVpids) > PIDSCANNER_PID_DELTA_COUNT)) {
+        if (((numVpids >= PIDSCANNER_VPID_COUNT) && (numApids >= PIDSCANNER_APID_COUNT)) ||
+            (abs(numApids - numVpids) >= PIDSCANNER_PID_DELTA_COUNT)) {
           // Lock channels for pid updates
           if (!Channels.Lock(true, 10)) {
              timeout.Set(PIDSCANNER_TIMEOUT_IN_MS);
              return;
              }
           cChannel *IptvChannel = Channels.GetByChannelID(channel.GetChannelID());
-           int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
-           int Dpids[MAXDPIDS + 1] = { 0 };
-           int Spids[MAXSPIDS + 1] = { 0 };
-           char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
-           char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
-           char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
-           int Ppid = IptvChannel->Ppid();
-           int Tpid = IptvChannel->Tpid();
-           bool foundApid = false;
-           if (numVpids <= PIDSCANNER_VPID_COUNT)
-              Vpid = 0; // No detected video pid
-           else if (numApids <= PIDSCANNER_APID_COUNT)
-              Apid = 0; // No detected audio pid
-           for (unsigned int i = 1; i < MAXAPIDS; ++i) {
-               Apids[i] = IptvChannel->Apid(i);
-               if (Apids[i] && (Apids[i] == Apid))
-                  foundApid = true;
-               }
-           if (!foundApid)
-              Apids[0] = Apid;
-           for (unsigned int i = 0; i < MAXDPIDS; ++i)
-               Dpids[i] = IptvChannel->Dpid(i);
-           for (unsigned int i = 0; i < MAXSPIDS; ++i)
-               Spids[i] = IptvChannel->Spid(i);
-           debug("cPidScanner::Process(): Vpid=0x%04X, Apid=0x%04X\n", Vpid, Apid);
-           IptvChannel->SetPids(Vpid, Ppid, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+           if (IptvChannel) {
+              int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
+              int Dpids[MAXDPIDS + 1] = { 0 };
+              int Spids[MAXSPIDS + 1] = { 0 };
+              char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
+              char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
+              char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
+              int Ppid = IptvChannel->Ppid();
+              int Tpid = IptvChannel->Tpid();
+              bool foundApid = false;
+              if (numVpids < PIDSCANNER_VPID_COUNT)
+                 Vpid = 0; // No detected video pid
+              else if (numApids < PIDSCANNER_APID_COUNT)
+                 Apid = 0; // No detected audio pid
+              for (unsigned int i = 1; i < MAXAPIDS; ++i) {
+                  Apids[i] = IptvChannel->Apid(i);
+                  if (Apids[i] && (Apids[i] == Apid))
+                     foundApid = true;
+                  }
+              if (!foundApid)
+                 Apids[0] = Apid;
+              for (unsigned int i = 0; i < MAXDPIDS; ++i)
+                  Dpids[i] = IptvChannel->Dpid(i);
+              for (unsigned int i = 0; i < MAXSPIDS; ++i)
+                  Spids[i] = IptvChannel->Spid(i);
+              debug("cPidScanner::Process(): Vpid=0x%04X, Apid=0x%04X\n", Vpid, Apid);
+#if defined(APIVERSNUM) && APIVERSNUM >= 10704
+              int Vtype = IptvChannel->Vtype();
+              IptvChannel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+#else
+              IptvChannel->SetPids(Vpid, Ppid, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+#endif
+              }
           Channels.Unlock();
           process = false;
           }
--- a/pidscanner.h
+++ b/pidscanner.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: pidscanner.h,v 1.3 2008/02/02 20:51:47 rahrenbe Exp $
 */

 #ifndef __PIDSCANNER_H
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.0.7\n"
+"Project-Id-Version: iptv 0.2.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-01 23:43+0200\n"
+"POT-Creation-Date: 2009-03-06 22:15+0200\n"
 "PO-Revision-Date: 2007-10-29 21:19+0100\n"
 "Last-Translator: Tobias Grimm <tg@e-tobi.net>\n"
 "Language-Team: German\n"
@@ -76,6 +76,9 @@ msgstr "Scanne SID"
 msgid "Scan pids"
 msgstr "Scanne PIDS"

+msgid "Vtype"
+msgstr "Vtype"
+
 msgid "Nid"
 msgstr "Nid"

--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -5,14 +5,14 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.0.7\n"
+"Project-Id-Version: iptv 0.2.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-01 23:43+0200\n"
+"POT-Creation-Date: 2009-03-06 22:15+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

 msgid "PAT (0x00)"
@@ -75,17 +75,20 @@ msgstr "Etsi palvelu-ID"
 msgid "Scan pids"
 msgstr "Etsi pidit"

+msgid "Vtype"
+msgstr "Kuvatyyppi"
+
 msgid "Nid"
 msgstr "Verkko-ID"

 msgid "Tid"
-msgstr "L<EFBFBD>hete-ID"
+msgstr "Lähete-ID"

 msgid "Rid"
 msgstr "Radio-ID"

 msgid "Cannot find unique channel settings!"
-msgstr "Yksil<EFBFBD>llisi<EFBFBD> kanava-asetuksia ei l<EFBFBD>ydet<EFBFBD>!"
+msgstr "Yksilöllisiä kanava-asetuksia ei löydetä!"

 msgid "IPTV Channels"
 msgstr "IPTV-kanavat"
@@ -116,21 +119,21 @@ msgid ""
 "\n"
 "Smaller sizes help memory consumption, but are more prone to buffer overflows."
 msgstr ""
-"M<EFBFBD><EFBFBD>rit<EFBFBD> rengaspuskurin koko TS-l<EFBFBD>hetteelle megatavuina.\n"
+"Määritä rengaspuskurin koko TS-lähetteelle megatavuina.\n"
 "\n"
-"Pienempi rengaspuskuri v<EFBFBD>hent<EFBFBD><EFBFBD> muistinkulutusta, mutta on virhealttiimpi puskurin ylivuodolle."
+"Pienempi rengaspuskuri vähentää muistinkulutusta, mutta on virhealttiimpi puskurin ylivuodolle."

 msgid "TS buffer prefill ratio [%]"
-msgstr "TS-puskurin esit<EFBFBD>ytt<EFBFBD>aste [%]"
+msgstr "TS-puskurin esitäyttöaste [%]"

 msgid ""
 "Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
 "\n"
 "This is useful if streaming media over a slow or unreliable connection."
 msgstr ""
-"M<EFBFBD><EFBFBD>rittele TS-rengaspuskurin esit<EFBFBD>ytt<EFBFBD>aste, jonka j<EFBFBD>lkeen l<EFBFBD>hetett<EFBFBD> aletaan siirt<EFBFBD>m<EFBFBD><EFBFBD>n eteenp<EFBFBD>in VDR:lle.\n"
+"Määrittele TS-rengaspuskurin esitäyttöaste, jonka jälkeen lähetettä aletaan siirtämään eteenpäin VDR:lle.\n"
 "\n"
-"Puskurin esit<EFBFBD>ytt<EFBFBD> parantaa suoratoistoa hitailla ja ep<EFBFBD>luotettavilla yhteyksill<EFBFBD>."
+"Puskurin esitäyttö parantaa suoratoistoa hitailla ja epäluotettavilla yhteyksillä."

 msgid "EXT protocol base port"
 msgstr "EXT-protokollan perusportti"
@@ -140,12 +143,12 @@ msgid ""
 "\n"
 "The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
 msgstr ""
-"M<EFBFBD><EFBFBD>rittele EXT-protokollan k<EFBFBD>ytt<EFBFBD>m<EFBFBD> perusportti.\n"
+"Määrittele EXT-protokollan käyttämä perusportti.\n"
 "\n"
-"Porttiavaruuden koko m<EFBFBD><EFBFBD>r<EFBFBD>ytyy k<EFBFBD>ytettyjen IPTV-laitteiden mukaan. Laajennos lukee EXT-protokollan yhteydess<EFBFBD> perusportista dataa, jota ulkoiset ohjelmistot tarjoavat."
+"Porttiavaruuden koko määräytyy käytettyjen IPTV-laitteiden mukaan. Laajennos lukee EXT-protokollan yhteydessä perusportista dataa, jota ulkoiset ohjelmistot tarjoavat."

 msgid "Use section filtering"
-msgstr "K<EFBFBD>yt<EFBFBD> sektioiden suodatusta"
+msgstr "Käytä sektioiden suodatusta"

 msgid ""
 "Define whether the section filtering shall be used.\n"
@@ -153,29 +156,29 @@ msgid ""
 "Section filtering means that IPTV plugin tries to parse and provide VDR with secondary data about the currently active stream. VDR can then use this data for providing various functionalities such as automatic pid change detection and EPG etc.\n"
 "Enabling this feature does not affect streams that do not contain section data."
 msgstr ""
-"M<EFBFBD><EFBFBD>rittele suodatuksen k<EFBFBD>ytt<EFBFBD> sektioille.\n"
+"Määrittele suodatuksen käyttö sektioille.\n"
 "\n"
-"IPTV-laajennos voi suodattaa l<EFBFBD>hetteest<EFBFBD> VDR:lle tarjottavia sektioita, joita k<EFBFBD>ytet<EFBFBD><EFBFBD>n esim. ohjelmaoppaan ja ohjelmatunnisteiden (PID) p<EFBFBD>ivitt<EFBFBD>miseen.\n"
-"Toiminto ei vaikuta l<EFBFBD>hetteeseen, jossa ei ole sektioita."
+"IPTV-laajennos voi suodattaa lähetteestä VDR:lle tarjottavia sektioita, joita käytetään esim. ohjelmaoppaan ja ohjelmatunnisteiden (PID) päivittämiseen.\n"
+"Toiminto ei vaikuta lähetteeseen, jossa ei ole sektioita."

 msgid "Disable filters"
-msgstr "Poista suodattimia k<EFBFBD>yt<EFBFBD>st<EFBFBD>"
+msgstr "Poista suodattimia käytöstä"

 msgid ""
 "Define number of section filters to be disabled.\n"
 "\n"
 "Certain section filters might cause some unwanted behaviour to VDR such as time being falsely synchronized. By black-listing the filters here useful section data can be left intact for VDR to process."
 msgstr ""
-"M<EFBFBD><EFBFBD>rittele k<EFBFBD>yt<EFBFBD>st<EFBFBD> poistettavien suodattimien lukum<EFBFBD><EFBFBD>r<EFBFBD> sektioille.\n"
+"Määrittele käytöstä poistettavien suodattimien lukumäärä sektioille.\n"
 "\n"
-"Tietyt sektiot saattavat aiheuttaa virheellist<EFBFBD> toimintaa VDR:ss<EFBFBD>, esimerkiksi asettavat v<EFBFBD><EFBFBD>r<EFBFBD>n kellonajan, ja n<EFBFBD>iden poistaminen auttaa VDR:<EFBFBD><EFBFBD> toimimaan kunnolla j<EFBFBD>ljelle j<EFBFBD><EFBFBD>vien sektioiden kanssa."
+"Tietyt sektiot saattavat aiheuttaa virheellistä toimintaa VDR:ssä, esimerkiksi asettavat väärän kellonajan, ja näiden poistaminen auttaa VDR:ää toimimaan kunnolla jäljelle jäävien sektioiden kanssa."

 #. TRANSLATORS: note the singular!
 msgid "Disable filter"
-msgstr "Poista suodatin k<EFBFBD>yt<EFBFBD>st<EFBFBD>"
+msgstr "Poista suodatin käytöstä"

 msgid "Define an ill-behaving filter to be blacklisted."
-msgstr "M<EFBFBD><EFBFBD>rittele k<EFBFBD>yt<EFBFBD>st<EFBFBD> poistettava suodatin, joka lis<EFBFBD>t<EFBFBD><EFBFBD>n mustalle listalle."
+msgstr "Määrittele käytöstä poistettava suodatin, joka lisätään mustalle listalle."

 msgid "Help"
 msgstr "Opaste"
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.0.7\n"
+"Project-Id-Version: iptv 0.2.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-01 23:43+0200\n"
+"POT-Creation-Date: 2009-03-06 22:15+0200\n"
 "PO-Revision-Date: 2008-01-26 13:14+0100\n"
 "Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n"
 "Language-Team: French\n"
@@ -77,6 +77,9 @@ msgstr "Scanne les SID"
 msgid "Scan pids"
 msgstr "Scanne les PID"

+msgid "Vtype"
+msgstr "Vtype"
+
 msgid "Nid"
 msgstr "Nid"

--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,15 +1,15 @@
 # VDR plugin language source file.
 # Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
-# Gringo <vdr-italian@tiscali.it>, 2008.
+# Diego Pierotto <vdr-italian@tiscali.it>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.0.7\n"
+"Project-Id-Version: iptv 0.2.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-01 23:43+0200\n"
-"PO-Revision-Date: 2008-01-13 16:46+0100\n"
-"Last-Translator: Gringo <vdr-italian@tiscali.it>\n"
+"POT-Creation-Date: 2009-03-06 22:15+0200\n"
+"PO-Revision-Date: 2008-07-13 03:28+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -38,7 +38,7 @@ msgid "TDT (0x70)"
 msgstr "TDT (0x70)"

 msgid "Experience the IPTV"
-msgstr "Esperimenta la IPTV"
+msgstr "Scopri la IPTV"

 msgid "UDP"
 msgstr "UDP"
@@ -47,7 +47,7 @@ msgid "HTTP"
 msgstr "HTTP"

 msgid "FILE"
-msgstr "DATEI"
+msgstr "FILE"

 msgid "EXT"
 msgstr "EXT"
@@ -59,7 +59,7 @@ msgid "Delay (ms)"
 msgstr "Ritardo (ms)"

 msgid "Script"
-msgstr "Skript"
+msgstr "Script"

 msgid "Parameter"
 msgstr "Parametro"
@@ -76,6 +76,9 @@ msgstr "Scansione Sid"
 msgid "Scan pids"
 msgstr "Scansione Pids"

+msgid "Vtype"
+msgstr "Vtype"
+
 msgid "Nid"
 msgstr "Nid"

@@ -117,15 +120,21 @@ msgid ""
 "\n"
 "Smaller sizes help memory consumption, but are more prone to buffer overflows."
 msgstr ""
+"Definisci una dimensione del buffer in MB per i flussi di trasporto.\n"
+"\n"
+"Dimensioni più piccole aiutano il consumo di memoria, ma sono più inclini a generare buffer overflows."

 msgid "TS buffer prefill ratio [%]"
-msgstr "Percentuale preriempimento buffer TS [%]"
+msgstr "Riempimento buffer TS [%]"

 msgid ""
 "Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
 "\n"
 "This is useful if streaming media over a slow or unreliable connection."
 msgstr ""
+"Definisci un rapporto di riempimento del buffer per i flussi di trasporto prima che i dati siano trasferiti a VDR.\n"
+"\n"
+"Questo è utile se si trasmette dati su una connessione lenta oppure inaffidabile."

 msgid "EXT protocol base port"
 msgstr "Porta base protocollo EXT"
@@ -135,6 +144,9 @@ msgid ""
 "\n"
 "The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
 msgstr ""
+"Definisci una porta base usata dal protocollo EXT.\n"
+"\n"
+"Il range della porta è definito dal numero di periferiche IPTV. Questo parametro imposta la porta che è in ascolto per connessioni da applicazioni esterne quando si usa il protocollo EXT."

 msgid "Use section filtering"
 msgstr "Utilizza sezione filtri"
@@ -145,6 +157,10 @@ msgid ""
 "Section filtering means that IPTV plugin tries to parse and provide VDR with secondary data about the currently active stream. VDR can then use this data for providing various functionalities such as automatic pid change detection and EPG etc.\n"
 "Enabling this feature does not affect streams that do not contain section data."
 msgstr ""
+"Definisci se la sezione filtri sarà utilizzata.\n"
+"\n"
+"La sezioni filtri significa che il plugin IPTV prova a elaborare e fornire a VDR dati secondari sul flusso attualmente attivo. VDR può successivamente usare questi dati per fornire varie funzionalità come il rilevamento del cambio Pid automatico, EPG, etc.\n"
+"Abilitare questa funzione non influisce sui flussi che non contengono dati di sezione."

 msgid "Disable filters"
 msgstr "Disabilita filtri"
@@ -154,13 +170,16 @@ msgid ""
 "\n"
 "Certain section filters might cause some unwanted behaviour to VDR such as time being falsely synchronized. By black-listing the filters here useful section data can be left intact for VDR to process."
 msgstr ""
+"Definisci il numero di sezione filtri che sarà disabilitato.\n"
+"\n"
+"Certe sezioni filtri potrebbero generare alcuni comportamenti indesiderati per VDR come la non sincronizzazione dell'ora. Inserendo qui i filtri nella lista nera i dati di sezione utili possono essere lasciati intatti per l'elaborazione da parte di VDR."

 #. TRANSLATORS: note the singular!
 msgid "Disable filter"
 msgstr "Disabilita filtro"

 msgid "Define an ill-behaving filter to be blacklisted."
-msgstr ""
+msgstr "Definisci un filtro corrotto che sarà messo nella lista nera."

 msgid "Help"
 msgstr "Aiuto"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -0,0 +1,170 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# This file is distributed under the same license as the iptv package.
+# Alexander Gross <Bikalexander@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: iptv 0.2.5\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2009-03-06 22:15+0200\n"
+"PO-Revision-Date: 2008-03-16 12:14+0100\n"
+"Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
+"Language-Team: Russian <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+msgid "PAT (0x00)"
+msgstr "PAT (0x00)"
+
+msgid "NIT (0x40)"
+msgstr "NIT (0x40)"
+
+msgid "SDT (0x42)"
+msgstr "SDT (0x42)"
+
+msgid "EIT (0x4E/0x4F)"
+msgstr "EIT (0x4E/0x4F)"
+
+msgid "EIT (0x5X)"
+msgstr "EIT (0x5X)"
+
+msgid "EIT (0x6X)"
+msgstr "EIT (0x6X)"
+
+msgid "TDT (0x70)"
+msgstr "TDT (0x70)"
+
+msgid "Experience the IPTV"
+msgstr "Попробуй IPTV"
+
+msgid "UDP"
+msgstr "UDP"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "FILE"
+msgstr "ФАЙЛ"
+
+msgid "EXT"
+msgstr "EXT"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Delay (ms)"
+msgstr "Задержка (мс)"
+
+msgid "Script"
+msgstr "Скрипт"
+
+msgid "Parameter"
+msgstr "Параметр"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Scan Sid"
+msgstr "Сканировать SID"
+
+msgid "Scan pids"
+msgstr "Сканировать пиды"
+
+msgid "Vtype"
+msgstr "Vtype"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Cannot find unique channel settings!"
+msgstr "Невозможно найти уникальные настройки канала!"
+
+msgid "IPTV Channels"
+msgstr "IPTV каналы"
+
+msgid "IPTV Information"
+msgstr "IPTV информация"
+
+msgid "General"
+msgstr "Общее"
+
+msgid "Pids"
+msgstr "Пиды"
+
+msgid "Filters"
+msgstr "Фильтры"
+
+msgid "Bits/bytes"
+msgstr "Биты / байт"
+
+msgid "IPTV information not available!"
+msgstr "IPTV информация отсутствует!"
+
+msgid "TS buffer size [MB]"
+msgstr "Размер TS буфера [MB]"
+
+msgid ""
+"Define a ringbuffer size for transport streams in megabytes.\n"
+"\n"
+"Smaller sizes help memory consumption, but are more prone to buffer overflows."
+msgstr ""
+
+msgid "TS buffer prefill ratio [%]"
+msgstr "Предварительный буфер TS [%]"
+
+msgid ""
+"Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n"
+"\n"
+"This is useful if streaming media over a slow or unreliable connection."
+msgstr ""
+
+msgid "EXT protocol base port"
+msgstr "Базисный порт EXT протокола"
+
+msgid ""
+"Define a base port used by EXT protocol.\n"
+"\n"
+"The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
+msgstr ""
+
+msgid "Use section filtering"
+msgstr "Использовать область фильтрации"
+
+msgid ""
+"Define whether the section filtering shall be used.\n"
+"\n"
+"Section filtering means that IPTV plugin tries to parse and provide VDR with secondary data about the currently active stream. VDR can then use this data for providing various functionalities such as automatic pid change detection and EPG etc.\n"
+"Enabling this feature does not affect streams that do not contain section data."
+msgstr ""
+
+msgid "Disable filters"
+msgstr "Деактивировать фильтры"
+
+msgid ""
+"Define number of section filters to be disabled.\n"
+"\n"
+"Certain section filters might cause some unwanted behaviour to VDR such as time being falsely synchronized. By black-listing the filters here useful section data can be left intact for VDR to process."
+msgstr ""
+
+#. TRANSLATORS: note the singular!
+msgid "Disable filter"
+msgstr "Деактивировать фильтр"
+
+msgid "Define an ill-behaving filter to be blacklisted."
+msgstr "Неправильно работающий фильтр, занести в черный список."
+
+msgid "Help"
+msgstr "Справка"
--- a/po2i18n.pl
+++ b/po2i18n.pl
@@ -1,156 +0,0 @@
-#!/usr/bin/perl
-#
-#  po2i18n - Convert plugin po files in into i18n.c-format
-#
-#  See the README file for copyright information and how to reach the author.
-#
-
-use strict;
-use warnings;
-
-my @LANGS = (
-  "en_US",
-  "de_DE",
-  "sl_SI",
-  "it_IT",
-  "nl_NL",
-  "pt_PT",
-  "fr_FR",
-  "nn_NO",
-  "fi_FI",
-  "pl_PL",
-  "es_ES",
-  "el_GR",
-  "sv_SE",
-  "ro_RO",
-  "hu_HU",
-  "ca_ES",
-  "ru_RU",
-  "hr_HR",
-  "et_EE",
-  "da_DK",
-  "cs_CZ",
-  "tr_TR"
-  );
-
-my %VERS = (
-  "en_US" => 10200,
-  "de_DE" => 10200,
-  "sl_SI" => 10200,
-  "it_IT" => 10200,
-  "nl_NL" => 10200,
-  "pt_PT" => 10200,
-  "fr_FR" => 10200,
-  "nn_NO" => 10200,
-  "fi_FI" => 10200,
-  "pl_PL" => 10200,
-  "es_ES" => 10200,
-  "el_GR" => 10200,
-  "sv_SE" => 10200,
-  "ro_RO" => 10200,
-  "hu_HU" => 10200,
-  "ca_ES" => 10200,
-  "ru_RU" => 10302,
-  "hr_HR" => 10307,
-  "et_EE" => 10313,
-  "da_DK" => 10316,
-  "cs_CZ" => 10342,
-  "tr_TR" => 10502
-  );
-
-
-my %strings;
-
-foreach my $lang (@LANGS) { $strings{$lang} = { }; }
-
-
-sub LoadLanguage(*) {
-    my ($lang) = @_;
-    
-    if (!open FILE, "<", "po/$lang.po") {
-        return 0;   
-    }
-    
-    my $msgid = "";
-    my $msgstr = "";
-    my $last = 0; # 0=init, 1=msgid was last, 2=msgstr was last
-    
-    while (<FILE>) {
-        chomp;
-        my $line = $_;
-        
-        if ($line =~ /^msgid "(.*)"$/) {
-            if ($last eq 2) {
-                $strings{$lang}->{$msgid} = $msgstr;
-                $strings{"en_US"}->{$msgid} = $msgid;
-            }
-            $msgid = $1;
-            $last = 1;
-        } elsif ($line =~ /^msgstr "(.*)"/) {
-            $msgstr = $1;
-            $last = 2;
-        } elsif ($line =~ /^"(.*)"/) {
-            if ($last eq 1) {
-                $msgid = $msgid . $1;
-            } elsif ($last eq 2) {
-                $msgstr = $msgstr . $1;
-            }
-        }       
-    }
-    if ($last eq 2) {
-        $strings{$lang}->{$msgid} = $msgstr;
-        $strings{"en_US"}->{$msgid} = $msgid;
-    }
-    
-    close FILE;
-}
-
-
-
-foreach my $lang (@LANGS) { 
-    LoadLanguage($lang);
-}
-
-my @msgids = sort keys %{$strings{"en_US"}};
-
-
-my $silent = 0;
-
-while (<>) {
-    my $line = $_;
-
-    if ($line =~ /^\/\/ START I18N/) {
-        print "// START I18N - automatically generated by po2i18n.pl\n";
-        for my $msgid (@msgids) {
-            next if $msgid eq "";
-
-            my $head = "  { ";
-            my $endif = "";
-            my $versnum = 10200;
-            
-            for my $lang (@LANGS) {
-                if ($VERS{$lang} ne $versnum) {
-                    $versnum = $VERS{$lang};
-                    print $endif;
-                    print "#if VDRVERSNUM >= $versnum\n";
-                    $endif = "#endif\n";
-                }
-                my $msgstr = $strings{$lang}->{$msgid};
-                $msgstr = "" if !defined $msgstr;
-                
-                print "$head\"$msgstr\",\n";
-                $head = "    ";
-            }
-            print $endif;
-            print "  },\n";
-        }
-        $silent = 1;
-    }
-
-    if (!$silent) { print $line; }
-
-    if ($line =~ /^\/\/ END I18N/) { 
-        print "// END I18N - automatically generated by po2i18n.pl\n";
-        $silent = 0; 
-    }    
-}
--- a/protocolext.c
+++ b/protocolext.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolext.c,v 1.24 2008/02/17 19:18:47 rahrenbe Exp $
 */

 #include <sys/wait.h>
@@ -107,7 +106,7 @@ bool cIptvProtocolExt::Open(void)
 {
  debug("cIptvProtocolExt::Open()\n");
  // Reject empty script files
-  if (!strlen(scriptFile))
+  if (!strlen(*scriptFile))
     return false;
  // Create the listening socket
  OpenSocket(socketPort);
@@ -128,9 +127,9 @@ bool cIptvProtocolExt::Close(void)
  return true;
 }

-int cIptvProtocolExt::Read(unsigned char* *BufferAddr)
+int cIptvProtocolExt::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
-  return cIptvUdpSocket::Read(BufferAddr);
+  return cIptvUdpSocket::Read(BufferAddr, BufferLen);
 }

 bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int Index)
@@ -140,7 +139,7 @@ bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int
     struct stat stbuf;
     // Update script file and parameter
     scriptFile = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), Location);
-     if ((stat(scriptFile, &stbuf) != 0) || (strstr(scriptFile, "..") != 0)) {
+     if ((stat(*scriptFile, &stbuf) != 0) || (strstr(*scriptFile, "..") != 0)) {
        error("ERROR: Non-existent or relative path script '%s'", *scriptFile);
        return false;
        }
--- a/protocolext.h
+++ b/protocolext.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolext.h,v 1.10 2008/02/17 19:18:47 rahrenbe Exp $
 */

 #ifndef __IPTV_PROTOCOLEXT_H
@@ -26,7 +25,7 @@ private:
 public:
  cIptvProtocolExt();
  virtual ~cIptvProtocolExt();
-  int Read(unsigned char* *BufferAddr);
+  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
  bool Set(const char* Location, const int Parameter, const int Index);
  bool Open(void);
  bool Close(void);
--- a/protocolfile.c
+++ b/protocolfile.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolfile.c,v 1.15 2008/01/04 23:36:37 ajhseppa Exp $
 */

 #include <fcntl.h>
@@ -17,15 +16,11 @@

 cIptvProtocolFile::cIptvProtocolFile()
 : fileDelay(0),
-  readBufferLen(TS_SIZE * IptvConfig.GetReadBufferTsCount()),
+  fileStream(NULL),
  isActive(false)
 {
  debug("cIptvProtocolFile::cIptvProtocolFile()\n");
  fileLocation = strdup("");
-  // Allocate receive buffer
-  readBuffer = MALLOC(unsigned char, readBufferLen);
-  if (!readBuffer)
-     error("ERROR: MALLOC() failed in ProtocolFile()");
 }

 cIptvProtocolFile::~cIptvProtocolFile()
@@ -35,7 +30,6 @@ cIptvProtocolFile::~cIptvProtocolFile()
  cIptvProtocolFile::Close();
  // Free allocated memory
  free(fileLocation);
-  free(readBuffer);
 }

 bool cIptvProtocolFile::OpenFile(void)
@@ -62,10 +56,9 @@ void cIptvProtocolFile::CloseFile(void)
     }
 }

-int cIptvProtocolFile::Read(unsigned char* *BufferAddr)
+int cIptvProtocolFile::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
   //debug("cIptvProtocolFile::Read()\n");
-   *BufferAddr = readBuffer;
   // Check errors
   if (ferror(fileStream)) {
      debug("Read error\n");
@@ -82,7 +75,7 @@ int cIptvProtocolFile::Read(unsigned char* *BufferAddr)
   // during the sleep and buffers are disposed. Check here that the plugin is
   // still active before accessing the buffers
   if (isActive)
-      return fread(readBuffer, sizeof(unsigned char), readBufferLen, fileStream);
+      return fread(BufferAddr, sizeof(unsigned char), BufferLen, fileStream);
   return -1;
 }

--- a/protocolfile.h
+++ b/protocolfile.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolfile.h,v 1.8 2008/01/04 23:36:37 ajhseppa Exp $
 */

 #ifndef __IPTV_PROTOCOLFILE_H
@@ -17,8 +16,6 @@ private:
  char* fileLocation;
  int fileDelay;
  FILE* fileStream;
-  unsigned char* readBuffer;
-  unsigned int readBufferLen;
  bool isActive;

 private:
@@ -28,7 +25,7 @@ private:
 public:
  cIptvProtocolFile();
  virtual ~cIptvProtocolFile();
-  int Read(unsigned char* *BufferAddr);
+  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
  bool Set(const char* Location, const int Parameter, const int Index);
  bool Open(void);
  bool Close(void);
--- a/protocolhttp.c
+++ b/protocolhttp.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolhttp.c,v 1.24 2008/02/17 19:18:47 rahrenbe Exp $
 */

 #include <sys/types.h>
@@ -34,7 +33,6 @@ cIptvProtocolHttp::~cIptvProtocolHttp()
  // Free allocated memory
  free(streamPath);
  free(streamAddr);
-
 }

 bool cIptvProtocolHttp::Connect(void)
@@ -47,7 +45,7 @@ bool cIptvProtocolHttp::Connect(void)

     // First try only the IP address
     sockAddr.sin_addr.s_addr = inet_addr(streamAddr);
-     
+
     if (sockAddr.sin_addr.s_addr == INADDR_NONE) {
        debug("Cannot convert %s directly to internet address\n", streamAddr);

@@ -64,8 +62,7 @@ bool cIptvProtocolHttp::Connect(void)
        sockAddr.sin_addr.s_addr = inet_addr(*host->h_addr_list);
        }

-     int err = connect(socketDesc, (struct sockaddr*)&sockAddr,
-		       sizeof(sockAddr));
+     int err = connect(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
     // Non-blocking sockets always report in-progress error when connected
     ERROR_IF_FUNC(err < 0 && errno != EINPROGRESS, "connect()", CloseSocket(), return false);
     // Select with 800ms timeout on the socket completion, check if it is writable
@@ -125,7 +122,7 @@ bool cIptvProtocolHttp::Disconnect(void)
 }

 bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
-				      unsigned int &recvLen)
+                                      unsigned int &recvLen)
 {
  debug("cIptvProtocolHttp::GetHeaderLine()\n");
  bool linefeed = false;
@@ -216,9 +213,9 @@ bool cIptvProtocolHttp::Close(void)
  return true;
 }

-int cIptvProtocolHttp::Read(unsigned char* *BufferAddr)
+int cIptvProtocolHttp::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
-  return cIptvTcpSocket::Read(BufferAddr);
+  return cIptvTcpSocket::Read(BufferAddr, BufferLen);
 }

 bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int Index)
@@ -237,7 +234,7 @@ bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int
     else
        streamPath = strcpyrealloc(streamPath, "/");
     socketPort = Parameter;
-     debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
+     //debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
     // Re-connect the socket
     Connect();
     }
--- a/protocolhttp.h
+++ b/protocolhttp.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolhttp.h,v 1.12 2008/01/04 23:36:37 ajhseppa Exp $
 */

 #ifndef __IPTV_PROTOCOLHTTP_H
@@ -21,14 +20,13 @@ private:
 private:
  bool Connect(void);
  bool Disconnect(void);
-  bool GetHeaderLine(char* dest, unsigned int destLen,
-		     unsigned int &recvLen);
+  bool GetHeaderLine(char* dest, unsigned int destLen, unsigned int &recvLen);
  bool ProcessHeaders(void);

 public:
  cIptvProtocolHttp();
  virtual ~cIptvProtocolHttp();
-  int Read(unsigned char* *BufferAddr);
+  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
  bool Set(const char* Location, const int Parameter, const int Index);
  bool Open(void);
  bool Close(void);
--- a/protocolif.h
+++ b/protocolif.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolif.h,v 1.8 2008/01/30 21:57:33 rahrenbe Exp $
 */

 #ifndef __IPTV_PROTOCOLIF_H
@@ -13,7 +12,7 @@ class cIptvProtocolIf {
 public:
  cIptvProtocolIf() {}
  virtual ~cIptvProtocolIf() {}
-  virtual int Read(unsigned char* *BufferAddr) = 0;
+  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen) = 0;
  virtual bool Set(const char* Location, const int Parameter, const int Index) = 0;
  virtual bool Open(void) = 0;
  virtual bool Close(void) = 0;
--- a/protocoludp.c
+++ b/protocoludp.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocoludp.c,v 1.22 2008/01/04 23:36:37 ajhseppa Exp $
 */

 #include <sys/types.h>
@@ -92,9 +91,9 @@ bool cIptvProtocolUdp::Close(void)
  return true;
 }

-int cIptvProtocolUdp::Read(unsigned char* *BufferAddr)
+int cIptvProtocolUdp::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
-  return cIptvUdpSocket::Read(BufferAddr);
+  return cIptvUdpSocket::Read(BufferAddr, BufferLen);
 }

 bool cIptvProtocolUdp::Set(const char* Location, const int Parameter, const int Index)
--- a/protocoludp.h
+++ b/protocoludp.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocoludp.h,v 1.13 2008/01/04 23:36:37 ajhseppa Exp $
 */

 #ifndef __IPTV_PROTOCOLUDP_H
@@ -24,7 +23,7 @@ private:
 public:
  cIptvProtocolUdp();
  virtual ~cIptvProtocolUdp();
-  int Read(unsigned char* *BufferAddr);
+  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
  bool Set(const char* Location, const int Parameter, const int Index);
  bool Open(void);
  bool Close(void);
--- a/sectionfilter.c
+++ b/sectionfilter.c
@@ -3,13 +3,12 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: sectionfilter.c,v 1.19 2008/02/17 19:18:47 rahrenbe Exp $
 */

 #include "sectionfilter.h"

-cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
-				       u_short Pid, u_char Tid, u_char Mask)
+cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
+                                       u_short Pid, u_char Tid, u_char Mask)
 : pusi_seen(0),
  feedcc(0),
  doneq(0),
@@ -18,10 +17,13 @@ cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
  seclen(0),
  tsfeedp(0),
  pid(Pid),
+  devid(DeviceIndex),
  id(Index),
  pipeName("")
 {
-  //debug("cIptvSectionFilter::cIptvSectionFilter(%d)\n", Index);
+  //debug("cIptvSectionFilter::cIptvSectionFilter(%d, %d)\n", devid, id);
+  int i;
+
  memset(secbuf_base, '\0', sizeof(secbuf_base));
  memset(filter_value, '\0', sizeof(filter_value));
  memset(filter_mask, '\0', sizeof(filter_mask));
@@ -29,17 +31,15 @@ cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
  memset(maskandmode, '\0', sizeof(maskandmode));
  memset(maskandnotmode, '\0', sizeof(maskandnotmode));

-  SetPipeName(devInd);
-
  filter_value[0] = Tid;
  filter_mask[0] = Mask;

  // Invert the filter
-  for (int i = 0; i < DMX_MAX_FILTER_SIZE; ++i)
+  for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i)
      filter_value[i] ^= 0xff;

  uint8_t mask, mode, local_doneq = 0;
-  for (int i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
+  for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
      mode = filter_mode[i];
      mask = filter_mask[i];
      maskandmode[i] = mask & mode;
@@ -48,11 +48,12 @@ cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
  doneq = local_doneq ? 1 : 0;

  struct stat sb;
+  pipeName = cString::sprintf(IPTV_FILTER_FILENAME, devid, id);
  stat(pipeName, &sb);
  if (S_ISFIFO(sb.st_mode))
     unlink(pipeName);
-  int err = mknod(pipeName, 0644 | S_IFIFO, 0);
-  ERROR_IF_RET(err < 0, "mknod()", return);
+  i = mknod(pipeName, 0644 | S_IFIFO, 0);
+  ERROR_IF_RET(i < 0, "mknod()", return);

  // Create descriptors
  fifoDescriptor = open(pipeName, O_RDWR | O_NONBLOCK);
@@ -61,127 +62,75 @@ cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,

 cIptvSectionFilter::~cIptvSectionFilter()
 {
-  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d)\n", id);
+  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d, %d)\n", devid, id);
  close(fifoDescriptor);
  close(readDescriptor);
  unlink(pipeName);
  fifoDescriptor = -1;
  readDescriptor = -1;
+  secbuf = NULL;
 }

-void cIptvSectionFilter::SetPipeName(int deviceIndex)
-{
-  pipeName = cString::sprintf(IPTV_FILTER_FILENAME, deviceIndex, id);
-}
-
-int cIptvSectionFilter::GetReadDesc()
+int cIptvSectionFilter::GetReadDesc(void)
 {
  return readDescriptor;
 }

-inline uint16_t cIptvSectionFilter::section_length(const uint8_t *buf)
+inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *Data)
 {
-  return 3 + ((buf[1] & 0x0f) << 8) + buf[2];
+  return 3 + ((Data[1] & 0x0f) << 8) + Data[2];
 }

-int cIptvSectionFilter::dmxdev_section_callback(const uint8_t *buffer1, size_t buffer1_len,
-                                                const uint8_t *buffer2, size_t buffer2_len,
-                                                enum dmx_success success)
+void cIptvSectionFilter::New(void)
 {
-  // See if there is data in the fifo
-  int retval = select_single_desc(fifoDescriptor, 0, false);
-  // There is no data in the fifo, more can be written
-  if (!retval) {
-#ifdef DEBUG_PRINTF
-     printf("id = %d, pid %d would now write %d data to buffer\n", id, pid, buffer1_len);
-     for (unsigned int i = 0; i < buffer1_len; ++i)
-         printf("0x%X ", buffer1[i]);
-     printf("\n");
-#endif
-     retval = write(fifoDescriptor, buffer1, buffer1_len);
-     ERROR_IF(retval < 0, "write()");
-     // Update statistics
-     AddSectionStatistic(retval, 1);
-     }
-#ifdef DEBUG_PRINTF
-  else if (retval)
-     printf("id %d pid %d data is already present\n", id, pid);
-#endif
-  return 0;
-}
-
-void cIptvSectionFilter::demux_swfilter_section_new()
-{
-#ifdef DEMUX_SECTION_LOSS_LOG
-  if (secbufp < tsfeedp) {
-     int i, n = tsfeedp - secbufp;
-     /*
-      * Section padding is done with 0xff bytes entirely.
-      * Due to speed reasons, we won't check all of them
-      * but just first and last.
-      */
-     if (secbuf[0] != 0xff || secbuf[n - 1] != 0xff) {
-        printf("sectionfilter.c section ts padding loss: %d/%d\n",
-               n, tsfeedp);
-        printf("sectionfilter.c pad data:");
-        for (i = 0; i < n; ++i)
-	    printf(" %02x", secbuf[i]);
-        printf("\n");
-        }
-     }
-#endif
  tsfeedp = secbufp = seclen = 0;
  secbuf = secbuf_base;
 }

-int cIptvSectionFilter::demux_swfilter_sectionfilter()
+int cIptvSectionFilter::Filter(void)
 {
  uint8_t neq = 0;
  int i;

-  for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
-      uint8_t local_xor = filter_value[i] ^ secbuf[i];
-      if (maskandmode[i] & local_xor) {
-#ifdef DEBUG_PRINTF
-         printf("maskandmode discard\n");
-#endif
-         return 0;
+  if (secbuf) {
+     for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
+         uint8_t local_xor = filter_value[i] ^ secbuf[i];
+         if (maskandmode[i] & local_xor)
+            return 0;
+         neq |= maskandnotmode[i] & local_xor;
         }
-      neq |= maskandnotmode[i] & local_xor;
-      }

-  if (doneq && !neq) {
-#ifdef DEBUG_PRINTF
-     printf("doneq discard, doneq = 0x%X, neq = 0x%X\n", doneq, !neq);
-#endif
-     return 0;
+     if (doneq && !neq)
+        return 0;
+
+     // There is no data in the fifo, more can be written
+     if (!select_single_desc(fifoDescriptor, 0, false)) {
+        i = write(fifoDescriptor, secbuf, seclen);
+        ERROR_IF(i < 0, "write()");
+        // Update statistics
+        AddSectionStatistic(i, 1);
+        }
     }
-  return dmxdev_section_callback(secbuf, seclen, NULL, 0, DMX_OK);
+  return 0;
 }

-inline int cIptvSectionFilter::demux_swfilter_section_feed()
+inline int cIptvSectionFilter::Feed(void)
 {
-  if (demux_swfilter_sectionfilter() < 0)
+  if (Filter() < 0)
     return -1;
  seclen = 0;
  return 0;
 }

-int cIptvSectionFilter::demux_swfilter_section_copy_dump(const uint8_t *buf, uint8_t len)
+int cIptvSectionFilter::CopyDump(const uint8_t *buf, uint8_t len)
 {
  uint16_t limit, seclen_local, n;

  if (tsfeedp >= DMX_MAX_SECFEED_SIZE)
     return 0;

-  if (tsfeedp + len > DMX_MAX_SECFEED_SIZE) {
-#ifdef DEMUX_SECTION_LOSS_LOG
-     printf("sectionfilter.c section buffer full loss: %d/%d\n",
-            tsfeedp + len - DMX_MAX_SECFEED_SIZE,
-            DMX_MAX_SECFEED_SIZE);
-#endif
+  if (tsfeedp + len > DMX_MAX_SECFEED_SIZE)
     len = DMX_MAX_SECFEED_SIZE - tsfeedp;
-     }

  if (len <= 0)
     return 0;
@@ -189,108 +138,80 @@ int cIptvSectionFilter::demux_swfilter_section_copy_dump(const uint8_t *buf, uin
  memcpy(secbuf_base + tsfeedp, buf, len);
  tsfeedp += len;

-  /*
-   * Dump all the sections we can find in the data (Emard)
-   */
  limit = tsfeedp;
  if (limit > DMX_MAX_SECFEED_SIZE)
-     return -1;	/* internal error should never happen */
+     return -1; // internal error should never happen

-  /* to be sure always set secbuf */
+  // Always set secbuf
  secbuf = secbuf_base + secbufp;

  for (n = 0; secbufp + 2 < limit; ++n) {
-      seclen_local = section_length(secbuf);
+      seclen_local = GetLength(secbuf);
      if (seclen_local <= 0 || seclen_local > DMX_MAX_SECTION_SIZE ||
         seclen_local + secbufp > limit)
         return 0;
-#ifdef DEBUG_PRINTF
-      printf("Non-mismatching seclen! %d, limit = %d\n", seclen_local, limit);
-#endif
      seclen = seclen_local;
-      /* dump [secbuf .. secbuf+seclen) */
      if (pusi_seen)
-         demux_swfilter_section_feed();
-#ifdef DEMUX_SECTION_LOSS_LOG
-      else
-         printf("sectionfilter.c pusi not seen, discarding section data\n");
-#endif
-      secbufp += seclen_local;	/* secbufp and secbuf moving together is */
-      secbuf += seclen_local;	/* redundant but saves pointer arithmetic */
+         Feed();
+      secbufp += seclen_local;
+      secbuf += seclen_local;
      }
  return 0;
 }

-void cIptvSectionFilter::ProcessData(const uint8_t* buf)
+void cIptvSectionFilter::Process(const uint8_t* Data)
 {
-  if (buf[0] != 0x47) {
-     error("Not TS packet: 0x%X\n", buf[0]);
+  if (Data[0] != TS_SYNC_BYTE)
     return;
-     }
-  
+
  // Stop if not the PID this filter is looking for
-  if (ts_pid(buf) != pid)
+  if (ts_pid(Data) != pid)
     return;

-  uint8_t count = payload(buf);
+  uint8_t count = payload(Data);

-  if (count == 0)		/* count == 0 if no payload or out of range */
+  // Check if no payload or out of range
+  if (count == 0)
     return;

-  uint8_t p = 188 - count;	/* payload start */
+  // Payload start
+  uint8_t p = TS_SIZE - count;

-  uint8_t cc = buf[3] & 0x0f;
+  uint8_t cc = Data[3] & 0x0f;
  int ccok = ((feedcc + 1) & 0x0f) == cc;
-  feedcc = cc;  
+  feedcc = cc;

  int dc_i = 0;
-  if (buf[3] & 0x20) {
-     /* adaption field present, check for discontinuity_indicator */
-     if ((buf[4] > 0) && (buf[5] & 0x80))
+  if (Data[3] & 0x20) {
+     // Adaption field present, check for discontinuity_indicator
+     if ((Data[4] > 0) && (Data[5] & 0x80))
        dc_i = 1;
     }

  if (!ccok || dc_i) {
-#ifdef DEMUX_SECTION_LOSS_LOG
-     printf("sectionfilter.c discontinuity detected %d bytes lost\n",
-            count);
-     /*
-      * those bytes under sume circumstances will again be reported
-      * in the following demux_swfilter_section_new
-      */
-#endif
-     /*
-      * Discontinuity detected. Reset pusi_seen = 0 to
-      * stop feeding of suspicious data until next PUSI=1 arrives
-      */
+     // Discontinuity detected. Reset pusi_seen = 0 to
+     // stop feeding of suspicious data until next PUSI=1 arrives
     pusi_seen = 0;
-     demux_swfilter_section_new();
+     New();
     }

-  if (buf[1] & 0x40) {
-     /* PUSI=1 (is set), section boundary is here */
-     if (count > 1 && buf[p] < count) {
-#ifdef DEBUG_PRINTF
-        printf("Valid section\n");
-#endif
-        const uint8_t *before = &buf[p + 1];
-        uint8_t before_len = buf[p];
+  if (Data[1] & 0x40) {
+     // PUSI=1 (is set), section boundary is here
+     if (count > 1 && Data[p] < count) {
+        const uint8_t *before = &Data[p + 1];
+        uint8_t before_len = Data[p];
        const uint8_t *after = &before[before_len];
        uint8_t after_len = (count - 1) - before_len;
+        CopyDump(before, before_len);

-        demux_swfilter_section_copy_dump(before, before_len);
-        /* before start of new section, set pusi_seen = 1 */
+        // Before start of new section, set pusi_seen = 1
        pusi_seen = 1;
-        demux_swfilter_section_new();
-        demux_swfilter_section_copy_dump(after, after_len);
+        New();
+        CopyDump(after, after_len);
        }
-#ifdef DEMUX_SECTION_LOSS_LOG
-     else if (count > 0)
-        printf("sectionfilter.c PUSI=1 but %d bytes lost\n", count);
-#endif
     }
  else {
-     /* PUSI=0 (is not set), no section boundary */
-     demux_swfilter_section_copy_dump(&buf[p], count);
+     // PUSI=0 (is not set), no section boundary
+     CopyDump(&Data[p], count);
     }
 }
--- a/sectionfilter.h
+++ b/sectionfilter.h
@@ -3,44 +3,22 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: sectionfilter.h,v 1.8 2008/02/17 19:18:47 rahrenbe Exp $
 */

 #ifndef __IPTV_SECTIONFILTER_H
 #define __IPTV_SECTIONFILTER_H

-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <libgen.h>
-#include <stdint.h>
-#include <sys/param.h>
+#include <vdr/device.h>

 #include "common.h"
 #include "statistics.h"

 class cIptvSectionFilter : public cIptvSectionStatistics {
 private:
-  enum dmx_success {
-    DMX_OK = 0, /* Received Ok */
-    DMX_LENGTH_ERROR, /* Incorrect length */
-    DMX_OVERRUN_ERROR, /* Receiver ring buffer overrun */
-    DMX_CRC_ERROR, /* Incorrect CRC */
-    DMX_FRAME_ERROR, /* Frame alignment error */
-    DMX_FIFO_ERROR, /* Receiver FIFO overrun */
-    DMX_MISSED_ERROR /* Receiver missed packet */
-  };
-
  enum dmx_limits {
    DMX_MAX_FILTER_SIZE  = 18,
    DMX_MAX_SECTION_SIZE = 4096,
-    DMX_MAX_SECFEED_SIZE = (DMX_MAX_SECTION_SIZE + 188)
+    DMX_MAX_SECFEED_SIZE = (DMX_MAX_SECTION_SIZE + TS_SIZE)
  };

  int fifoDescriptor;
@@ -56,49 +34,32 @@ private:
  uint16_t seclen;
  uint16_t tsfeedp;
  uint16_t pid;
+
+  int devid;
  int id;
+  cString pipeName;

  uint8_t filter_value[DMX_MAX_FILTER_SIZE];
  uint8_t filter_mask[DMX_MAX_FILTER_SIZE];
  uint8_t filter_mode[DMX_MAX_FILTER_SIZE];
-   
+
  uint8_t maskandmode[DMX_MAX_FILTER_SIZE];
  uint8_t maskandnotmode[DMX_MAX_FILTER_SIZE];

-  cString pipeName;
-
-  inline uint16_t section_length(const uint8_t *buf);
-
-  int dmxdev_section_callback(const uint8_t *buffer1,
-                              size_t buffer1_len,
-                              const uint8_t *buffer2,
-                              size_t buffer2_len,
-                              enum dmx_success success);
-
-  void demux_swfilter_section_new();
-
-  int demux_swfilter_sectionfilter();
-
-  inline int demux_swfilter_section_feed();
-
-  int demux_swfilter_section_copy_dump(const uint8_t *buf,
-                                       uint8_t len);
-
-  int GetFifoDesc();
-  void ClearPipeName();
-  void SetPipeName(int deviceIndex);
+  inline uint16_t GetLength(const uint8_t *Data);
+  void New(void);
+  int Filter(void);
+  inline int Feed(void);
+  int CopyDump(const uint8_t *buf, uint8_t len);

 public:
  // constructor & destructor
-  cIptvSectionFilter(int Index, int devInd, u_short Pid, u_char Tid,
-                     u_char Mask);
-
+  cIptvSectionFilter(int Index, int DeviceIndex, u_short Pid,
+                     u_char Tid, u_char Mask);
  virtual ~cIptvSectionFilter();
-
-  void ProcessData(const uint8_t* buf);
-
-  int GetReadDesc();
-  uint16_t GetPid() { return pid; }
+  void Process(const uint8_t* Data);
+  int GetReadDesc(void);
+  uint16_t GetPid(void) const { return pid; }
 };

 #endif // __IPTV_SECTIONFILTER_H
--- a/setup.c
+++ b/setup.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: setup.c,v 1.56 2008/02/18 16:50:07 rahrenbe Exp $
 */

 #include <string.h>
@@ -18,10 +17,6 @@
 #include "device.h"
 #include "setup.h"

-#ifndef trVDR
-#define trVDR(s) tr(s)
-#endif
-
 // --- cIptvMenuEditChannel --------------------------------------------------

 class cIptvMenuEditChannel : public cOsdMenu
@@ -35,7 +30,7 @@ private:
    eProtocolCount
  };
  struct tIptvChannel {
-    int frequency, source, protocol, parameter, vpid, ppid, tpid, sid, nid, tid, rid;
+    int frequency, source, protocol, parameter, vpid, ppid, vtype, tpid, sid, nid, tid, rid;
    int apid[MAXAPIDS + 1], dpid[MAXDPIDS + 1], spid[MAXSPIDS + 1], caids[MAXCAIDS + 1];
    int sidscan, pidscan;
    char name[256], location[256];
@@ -58,7 +53,7 @@ cIptvMenuEditChannel::cIptvMenuEditChannel(cChannel *Channel, bool New)
  protocols[eProtocolUDP]  = tr("UDP");
  protocols[eProtocolHTTP] = tr("HTTP");
  protocols[eProtocolFILE] = tr("FILE");
-  protocols[eProtocolEXT] = tr("EXT");
+  protocols[eProtocolEXT]  = tr("EXT");
  channel = Channel;
  GetChannelData(channel);
  if (New) {
@@ -117,29 +112,6 @@ cString cIptvMenuEditChannel::GetIptvSettings(const char *Param, int *Parameter,
        return locstr;
        }
     }
-  else if (sscanf(Param, "%a[^|]|%a[^|]|%a[^|]|%d", &tag, &proto, &loc, Parameter) == 4) {
-     cString tagstr(tag, true);
-     cString protostr(proto, true);
-     cString locstr(loc, true);
-     *SidScan = 0;
-     *PidScan = 0;
-     // check if IPTV tag
-     if (strncasecmp(*tagstr, "IPTV", 4) == 0) {
-        // check if protocol is supported and update the pointer
-        if (strncasecmp(*protostr, "UDP", 3) == 0)
-           *Protocol = eProtocolUDP;
-        else if (strncasecmp(*protostr, "HTTP", 4) == 0)
-           *Protocol = eProtocolHTTP;
-        else if (strncasecmp(*protostr, "FILE", 4) == 0)
-           *Protocol = eProtocolFILE;
-        else if (strncasecmp(*protostr, "EXT", 3) == 0)
-           *Protocol = eProtocolEXT;
-        else
-           return NULL;
-        // return location
-        return locstr;
-        }
-     }
  return NULL;
 }

@@ -151,6 +123,9 @@ void cIptvMenuEditChannel::GetChannelData(cChannel *Channel)
     data.source = Channel->Source();
     data.vpid = Channel->Vpid();
     data.ppid = Channel->Ppid();
+#if defined(APIVERSNUM) && APIVERSNUM >= 10704
+     data.vtype = Channel->Vtype();
+#endif
     data.tpid = Channel->Tpid();
     for (unsigned int i = 0; i < ARRAY_SIZE(data.apid); ++i)
         data.apid[i] = Channel->Apid(i);
@@ -176,6 +151,7 @@ void cIptvMenuEditChannel::GetChannelData(cChannel *Channel)
     data.source = cSource::FromData(cSource::stPlug);
     data.vpid = 0;
     data.ppid = 0;
+     data.vtype = 0;
     data.tpid = 0;
     for (unsigned int i = 0; i < ARRAY_SIZE(data.apid); ++i)
         data.apid[i] = 0;
@@ -219,10 +195,10 @@ void cIptvMenuEditChannel::SetChannelData(cChannel *Channel)
            param = cString::sprintf("IPTV|S%dP%d|UDP|%s|%d", data.sidscan, data.pidscan, data.location, data.parameter);
            break;
       }
-#if defined(APIVERSNUM) && APIVERSNUM < 10510
-     Channel->SetPids(data.vpid, data.ppid, data.apid, alangs, data.dpid, dlangs, data.tpid);
-#else
     char slangs[MAXSPIDS][MAXLANGCODE2] = { "" };
+#if defined(APIVERSNUM) && APIVERSNUM >= 10704
+     Channel->SetPids(data.vpid, data.ppid, data.vtype, data.apid, alangs, data.dpid, dlangs, data.spid, slangs, data.tpid);
+#else
     Channel->SetPids(data.vpid, data.ppid, data.apid, alangs, data.dpid, dlangs, data.spid, slangs, data.tpid);
 #endif
     Channel->SetCaIds(data.caids);
@@ -241,29 +217,17 @@ void cIptvMenuEditChannel::Setup(void)
                            eProtocolCount, protocols));
  switch (data.protocol) {
    case eProtocolFILE:
-#if defined(APIVERSNUM) && APIVERSNUM < 10511
-         Add(new cMenuEditStrItem(trVDR("File"),     data.location, sizeof(data.location), trVDR(FileNameChars)));
-#else
         Add(new cMenuEditStrItem(trVDR("File"),     data.location, sizeof(data.location)));
-#endif
         Add(new cMenuEditIntItem(tr("Delay (ms)"), &data.parameter,  0, 0xFFFF));
         break;
    case eProtocolEXT:
-#if defined(APIVERSNUM) && APIVERSNUM < 10511
-         Add(new cMenuEditStrItem(tr("Script"),     data.location, sizeof(data.location), trVDR(FileNameChars)));
-#else
         Add(new cMenuEditStrItem(tr("Script"),     data.location, sizeof(data.location)));
-#endif
         Add(new cMenuEditIntItem(tr("Parameter"), &data.parameter,  0, 0xFFFF));
         break;
    case eProtocolHTTP:
    case eProtocolUDP:
    default:
-#if defined(APIVERSNUM) && APIVERSNUM < 10511
-         Add(new cMenuEditStrItem(tr("Address"), data.location, sizeof(data.location), trVDR(FileNameChars)));
-#else
         Add(new cMenuEditStrItem(tr("Address"), data.location, sizeof(data.location)));
-#endif
         Add(new cMenuEditIntItem(tr("Port"),   &data.parameter,  0, 0xFFFF));
         break;
    }
@@ -273,22 +237,19 @@ void cIptvMenuEditChannel::Setup(void)
  Add(sidScanItem);
  Add(new cMenuEditBoolItem(tr("Scan pids"),   &data.pidscan));
  // Normal settings
-#if defined(APIVERSNUM) && APIVERSNUM < 10511
-  Add(new cMenuEditStrItem(trVDR("Name"),       data.name,     sizeof(data.name), trVDR(FileNameChars)));
-#else
  Add(new cMenuEditStrItem(trVDR("Name"),       data.name,     sizeof(data.name)));
-#endif
  Add(new cMenuEditIntItem(trVDR("Frequency"), &data.frequency));
  Add(new cMenuEditIntItem(trVDR("Vpid"),      &data.vpid,     0, 0x1FFF));
+#if defined(APIVERSNUM) && APIVERSNUM >= 10704
+  Add(new cMenuEditIntItem(tr   ("Vtype"),     &data.vtype,    0, 0xFF));
+#endif
  Add(new cMenuEditIntItem(trVDR("Ppid"),      &data.ppid,     0, 0x1FFF));
  Add(new cMenuEditIntItem(trVDR("Apid1"),     &data.apid[0],  0, 0x1FFF));
  Add(new cMenuEditIntItem(trVDR("Apid2"),     &data.apid[1],  0, 0x1FFF));
  Add(new cMenuEditIntItem(trVDR("Dpid1"),     &data.dpid[0],  0, 0x1FFF));
  Add(new cMenuEditIntItem(trVDR("Dpid2"),     &data.dpid[1],  0, 0x1FFF));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10510
  Add(new cMenuEditIntItem(trVDR("Spid1"),     &data.spid[0],  0, 0x1FFF));
  Add(new cMenuEditIntItem(trVDR("Spid2"),     &data.spid[1],  0, 0x1FFF));
-#endif
  Add(new cMenuEditIntItem(trVDR("Tpid"),      &data.tpid,     0, 0x1FFF));
  Add(new cMenuEditIntItem(trVDR("CA"),        &data.caids[0], 0, 0xFFFF));
  Add(new cMenuEditIntItem(trVDR("Sid"),       &data.sid,      1, 0xFFFF));
@@ -426,7 +387,7 @@ class cIptvMenuChannels : public cOsdMenu
 {
 private:
  void Setup(void);
-  cChannel *GetChannel(int Index);
+  cChannel *GetChannel(int Index) const;
  void Propagate(void);

 protected:
@@ -466,16 +427,16 @@ void cIptvMenuChannels::Setup(void)
  Display();
 }

-cChannel *cIptvMenuChannels::GetChannel(int Index)
+cChannel *cIptvMenuChannels::GetChannel(int Index) const
 {
-  cIptvMenuChannelItem *p = (cIptvMenuChannelItem *)Get(Index);
+  cIptvMenuChannelItem *p = dynamic_cast<cIptvMenuChannelItem *>(Get(Index));
  return p ? (cChannel *)p->Channel() : NULL;
 }

 void cIptvMenuChannels::Propagate(void)
 {
  Channels.ReNumber();
-  for (cIptvMenuChannelItem *ci = (cIptvMenuChannelItem *)First(); ci; ci = (cIptvMenuChannelItem *)ci->Next())
+  for (cIptvMenuChannelItem *ci = dynamic_cast<cIptvMenuChannelItem *>(First()); ci; ci = dynamic_cast<cIptvMenuChannelItem *>(ci->Next()))
      ci->Set();
  Display();
  Channels.SetModified(true);
@@ -653,7 +614,7 @@ eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
       case kYellow: page = IPTV_DEVICE_INFO_FILTERS;
                     UpdateInfo();
                     break;
-       case kBlue:   IptvConfig.SetUseBytes(!IptvConfig.GetUseBytes());
+       case kBlue:   IptvConfig.SetUseBytes(IptvConfig.GetUseBytes() ? 0 : 1);
                     UpdateInfo();
                     break;
       default:      if (timeout.TimedOut())
@@ -690,42 +651,28 @@ void cIptvPluginSetup::Setup(void)
  int current = Current();

  Clear();
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
  help.Clear();
-#endif

  Add(new cMenuEditIntItem( tr("TS buffer size [MB]"), &tsBufferSize, 1, 4));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
  help.Append(tr("Define a ringbuffer size for transport streams in megabytes.\n\nSmaller sizes help memory consumption, but are more prone to buffer overflows."));
-#endif

  Add(new cMenuEditIntItem( tr("TS buffer prefill ratio [%]"), &tsBufferPrefill, 0, 40));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
  help.Append(tr("Define a prefill ratio of the ringbuffer for transport streams before data is transferred to VDR.\n\nThis is useful if streaming media over a slow or unreliable connection."));
-#endif

  Add(new cMenuEditIntItem( tr("EXT protocol base port"), &extProtocolBasePort, 0, 0xFFF7));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
  help.Append(tr("Define a base port used by EXT protocol.\n\nThe port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."));
-#endif

  Add(new cMenuEditBoolItem(tr("Use section filtering"), &sectionFiltering));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
  help.Append(tr("Define whether the section filtering shall be used.\n\nSection filtering means that IPTV plugin tries to parse and provide VDR with secondary data about the currently active stream. VDR can then use this data for providing various functionalities such as automatic pid change detection and EPG etc.\nEnabling this feature does not affect streams that do not contain section data."));
-#endif

  if (sectionFiltering) {
     Add(new cMenuEditIntItem( tr("Disable filters"), &numDisabledFilters, 0, SECTION_FILTER_TABLE_SIZE));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
     help.Append(tr("Define number of section filters to be disabled.\n\nCertain section filters might cause some unwanted behaviour to VDR such as time being falsely synchronized. By black-listing the filters here useful section data can be left intact for VDR to process."));
-#endif

     for (int i = 0; i < numDisabledFilters; ++i) {
         // TRANSLATORS: note the singular!
         Add(new cMenuEditStraItem(tr("Disable filter"), &disabledFilterIndexes[i], SECTION_FILTER_TABLE_SIZE, disabledFilterNames));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
         help.Append(tr("Define an ill-behaving filter to be blacklisted."));
-#endif
         }
     }

@@ -759,11 +706,9 @@ eOSState cIptvPluginSetup::ProcessKey(eKeys Key)
     switch (Key) {
       case kRed:  return EditChannel();
       case kBlue: return ShowInfo();
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
       case kInfo: if (Current() < help.Size())
                      return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), help[Current()]));
-#endif
-       default:    state = osContinue;
+       default:    state = osContinue; break;
       }
     }

--- a/setup.h
+++ b/setup.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: setup.h,v 1.20 2008/02/01 21:54:24 rahrenbe Exp $
 */

 #ifndef __IPTV_SETUP_H
@@ -22,13 +21,11 @@ private:
  int numDisabledFilters;
  int disabledFilterIndexes[SECTION_FILTER_TABLE_SIZE];
  const char *disabledFilterNames[SECTION_FILTER_TABLE_SIZE];
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
  cVector<const char*> help;
-#endif

  eOSState EditChannel(void);
  eOSState ShowInfo(void);
-  virtual void Setup(void);
+  void Setup(void);
  void StoreFilters(const char *Name, int *Values);

 protected:
--- a/sidscanner.c
+++ b/sidscanner.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: sidscanner.c,v 1.1 2007/10/01 18:14:57 rahrenbe Exp $
 */

 #include <libsi/section.h>
@@ -52,8 +51,9 @@ void cSidScanner::Process(u_short Pid, u_char Tid, const u_char *Data, int Lengt
               if (!Channels.Lock(true, 10))
                  return;
               cChannel *IptvChannel = Channels.GetByChannelID(channel.GetChannelID());
-               IptvChannel->SetId(IptvChannel->Nid(), IptvChannel->Tid(),
-                                  assoc.getServiceId(), IptvChannel->Rid());
+               if (IptvChannel)
+                  IptvChannel->SetId(IptvChannel->Nid(), IptvChannel->Tid(),
+                                    assoc.getServiceId(), IptvChannel->Rid());
               Channels.Unlock();
               }
            SetChannel(NULL);
--- a/sidscanner.h
+++ b/sidscanner.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: sidscanner.h,v 1.1 2007/10/01 18:14:57 rahrenbe Exp $
 */

 #ifndef __SIDSCANNER_H
@@ -18,11 +17,13 @@ private:

 protected:
  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
+  virtual void SetStatus(bool On);

 public:
  cSidScanner(void);
-  virtual void SetStatus(bool On);
  void SetChannel(const cChannel *Channel);
+  void Open() { SetStatus(true); }
+  void Close() { SetStatus(false); }
 };

 #endif // __SIDSCANNER_H
--- a/socket.c
+++ b/socket.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: socket.c,v 1.7 2008/01/30 21:57:33 rahrenbe Exp $
 */

 #include <sys/types.h>
@@ -21,14 +20,9 @@
 cIptvSocket::cIptvSocket()
 : socketPort(0),
  socketDesc(-1),
-  readBufferLen(TS_SIZE * IptvConfig.GetReadBufferTsCount()),
  isActive(false)
 {
  debug("cIptvSocket::cIptvSocket()\n");
-  // Allocate receive buffer
-  readBuffer = MALLOC(unsigned char, readBufferLen);
-  if (!readBuffer)
-     error("ERROR: MALLOC() failed in socket()");
 }

 cIptvSocket::~cIptvSocket()
@@ -36,8 +30,6 @@ cIptvSocket::~cIptvSocket()
  debug("cIptvSocket::~cIptvSocket()\n");
  // Close the socket
  CloseSocket();
-  // Free allocated memory
-  free(readBuffer);
 }

 bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
@@ -51,7 +43,7 @@ bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
     }
  // Bind to the socket if it is not active already
  if (socketDesc < 0) {
-     int yes = 1;     
+     int yes = 1;
     // Create socket
     if (isUdp)
        socketDesc = socket(PF_INET, SOCK_DGRAM, 0);
@@ -59,10 +51,11 @@ bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
        socketDesc = socket(PF_INET, SOCK_STREAM, 0);
     ERROR_IF_RET(socketDesc < 0, "socket()", return false);
     // Make it use non-blocking I/O to avoid stuck read calls
-     ERROR_IF_FUNC(fcntl(socketDesc, F_SETFL, O_NONBLOCK), "fcntl()", CloseSocket(), return false);
+     ERROR_IF_FUNC(fcntl(socketDesc, F_SETFL, O_NONBLOCK), "fcntl()",
+                   CloseSocket(), return false);
     // Allow multiple sockets to use the same PORT number
-     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes,
-                              sizeof(yes)) < 0, "setsockopt()", CloseSocket(), return false);
+     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0, "setsockopt()",
+                   CloseSocket(), return false);
     // Bind socket
     memset(&sockAddr, '\0', sizeof(sockAddr));
     sockAddr.sin_family = AF_INET;
@@ -105,7 +98,7 @@ bool cIptvUdpSocket::OpenSocket(const int Port)
  return cIptvSocket::OpenSocket(Port, true);
 }

-int cIptvUdpSocket::Read(unsigned char* *BufferAddr)
+int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
  //debug("cIptvUdpSocket::Read()\n");
  // Error out if socket not initialized
@@ -114,51 +107,40 @@ int cIptvUdpSocket::Read(unsigned char* *BufferAddr)
     return -1;
     }
  socklen_t addrlen = sizeof(sockAddr);
-  // Set argument point to read buffer
-  *BufferAddr = readBuffer;
-  // Wait 500ms for data
-  int retval = select_single_desc(socketDesc, 500000, false);
-  // Check if error
-  if (retval < 0)
-     return retval;
-  // Check if data available
-  else if (retval) {
-     int len = 0;
-     // Read data from socket
-     if (isActive)
-        len = recvfrom(socketDesc, readBuffer, readBufferLen, MSG_DONTWAIT,
-                       (struct sockaddr *)&sockAddr, &addrlen);
-     ERROR_IF_RET(len < 0, "recvfrom()", return len);
-     if ((len > 0) && (readBuffer[0] == 0x47)) {
-        // Set argument point to read buffer
-        *BufferAddr = &readBuffer[0];
-        return len;
+  int len = 0;
+  // Read data from socket
+  if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
+     len = recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+                    (struct sockaddr *)&sockAddr, &addrlen);
+  if ((len > 0) && (BufferAddr[0] == TS_SYNC_BYTE)) {
+     return len;
+     }
+  else if (len > 3) {
+     // http://www.networksorcery.com/enp/rfc/rfc2250.txt
+     // version
+     unsigned int v = (BufferAddr[0] >> 6) & 0x03;
+     // extension bit
+     unsigned int x = (BufferAddr[0] >> 4) & 0x01;
+     // cscr count
+     unsigned int cc = BufferAddr[0] & 0x0F;
+     // payload type: MPEG2 TS = 33
+     //unsigned int pt = readBuffer[1] & 0x7F;
+     // header lenght
+     unsigned int headerlen = (3 + cc) * sizeof(uint32_t);
+     // check if extension
+     if (x) {
+        // extension header length
+        unsigned int ehl = (((BufferAddr[headerlen + 2] & 0xFF) << 8) |
+                            (BufferAddr[headerlen + 3] & 0xFF));
+        // update header length
+        headerlen += (ehl + 1) * sizeof(uint32_t);
        }
-     else if (len > 3) {
-        // http://www.networksorcery.com/enp/rfc/rfc2250.txt
-        // version
-        unsigned int v = (readBuffer[0] >> 6) & 0x03;
-        // extension bit
-        unsigned int x = (readBuffer[0] >> 4) & 0x01;
-        // cscr count
-        unsigned int cc = readBuffer[0] & 0x0F;
-        // payload type: MPEG2 TS = 33
-        //unsigned int pt = readBuffer[1] & 0x7F;
-        // header lenght
-        unsigned int headerlen = (3 + cc) * sizeof(uint32_t);
-        // check if extension
-        if (x) {
-           // extension header length
-           unsigned int ehl = (((readBuffer[headerlen + 2] & 0xFF) << 8) | (readBuffer[headerlen + 3] & 0xFF));
-           // update header length
-           headerlen += (ehl + 1) * sizeof(uint32_t);
-           }
-        // Check that rtp is version 2 and payload contains multiple of TS packet data
-        if ((v == 2) && (((len - headerlen) % TS_SIZE) == 0) && (readBuffer[headerlen] == 0x47)) {
-           // Set argument point to payload in read buffer
-           *BufferAddr = &readBuffer[headerlen];
-           return (len - headerlen);
-           }
+     // Check that rtp is version 2 and payload contains multiple of TS packet data
+     if ((v == 2) && (((len - headerlen) % TS_SIZE) == 0) &&
+         (BufferAddr[headerlen] == TS_SYNC_BYTE)) {
+        // Set argument point to payload in read buffer
+        memmove(BufferAddr, &BufferAddr[headerlen], (len - headerlen));
+        return (len - headerlen);
        }
     }
  return 0;
@@ -181,7 +163,7 @@ bool cIptvTcpSocket::OpenSocket(const int Port)
  return cIptvSocket::OpenSocket(Port, false);
 }

-int cIptvTcpSocket::Read(unsigned char* *BufferAddr)
+int cIptvTcpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
  //debug("cIptvTcpSocket::Read()\n");
  // Error out if socket not initialized
@@ -190,19 +172,9 @@ int cIptvTcpSocket::Read(unsigned char* *BufferAddr)
     return -1;
     }
  socklen_t addrlen = sizeof(sockAddr);
-  // Set argument point to read buffer
-  *BufferAddr = readBuffer;
-  // Wait 500ms for data
-  int retval = select_single_desc(socketDesc, 500000, false);
-  // Check if error
-  if (retval < 0)
-     return retval;
-  // Check if data available
-  else if (retval) {
-     // Read data from socket
-     if (isActive)
-        return recvfrom(socketDesc, readBuffer, readBufferLen, MSG_DONTWAIT,
-                        (struct sockaddr *)&sockAddr, &addrlen);
-     }
+  // Read data from socket
+  if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
+     return recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+                     (struct sockaddr *)&sockAddr, &addrlen);
  return 0;
 }
--- a/socket.h
+++ b/socket.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: socket.h,v 1.3 2007/10/21 19:32:15 ajhseppa Exp $
 */

 #ifndef __IPTV_SOCKET_H
@@ -15,8 +14,6 @@ class cIptvSocket {
 protected:
  int socketPort;
  int socketDesc;
-  unsigned char* readBuffer;
-  unsigned int readBufferLen;
  struct sockaddr_in sockAddr;
  bool isActive;

@@ -33,7 +30,7 @@ class cIptvUdpSocket : public cIptvSocket {
 public:
  cIptvUdpSocket();
  virtual ~cIptvUdpSocket();
-  virtual int Read(unsigned char* *BufferAddr);
+  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
  bool OpenSocket(const int Port);
 };

@@ -41,7 +38,7 @@ class cIptvTcpSocket : public cIptvSocket {
 public:
  cIptvTcpSocket();
  virtual ~cIptvTcpSocket();
-  virtual int Read(unsigned char* *BufferAddr);
+  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
  bool OpenSocket(const int Port);
 };

--- a/statistics.c
+++ b/statistics.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: statistics.c,v 1.22 2008/01/19 21:08:03 ajhseppa Exp $
 */

 #include <limits.h>
@@ -33,7 +32,7 @@ cString cIptvSectionStatistics::GetSectionStatistic()
  cMutexLock MutexLock(&mutex);
  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
  timer.Set();
-  long bitrate = elapsed ? (long)((float)1000 / KILOBYTE(1) * filteredData / elapsed) : 0L;
+  long bitrate = elapsed ? (long)(((float)1000 / KILOBYTE(1)) * filteredData / elapsed) : 0L;
  if (!IptvConfig.GetUseBytes())
     bitrate *= 8;
  // no trailing linefeed here!
@@ -76,7 +75,7 @@ cString cIptvPidStatistics::GetPidStatistic()
  cString info("Active pids:\n");
  for (unsigned int i = 0; i < IPTV_STATS_ACTIVE_PIDS_COUNT; ++i) {
      if (mostActivePids[i].pid) {
-         long bitrate = elapsed ? (long)((float)1000 / KILOBYTE(1) * mostActivePids[i].DataAmount / elapsed) : 0L;
+         long bitrate = elapsed ? (long)(((float)1000 / KILOBYTE(1)) * mostActivePids[i].DataAmount / elapsed) : 0L;
         if (!IptvConfig.GetUseBytes())
            bitrate *= 8;
         info = cString::sprintf("%sPid %d: %4d (%4ld k%s/s)\n", *info, i,
@@ -120,7 +119,7 @@ void cIptvPidStatistics::AddPidStatistic(u_short Pid, long Payload)
      mostActivePids[numberOfElements - 1].pid = Pid;
      mostActivePids[numberOfElements - 1].DataAmount = Payload;
     // Re-sort
-     qsort(&mostActivePids, numberOfElements, sizeof(pidStruct), SortPids);
+     qsort(mostActivePids, numberOfElements, sizeof(pidStruct), SortPids);
     }
 }

@@ -146,7 +145,7 @@ cString cIptvStreamerStatistics::GetStreamerStatistic()
  cMutexLock MutexLock(&mutex);
  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
  timer.Set();
-  long bitrate = elapsed ? (long)((float)1000 / KILOBYTE(1) * dataBytes / elapsed) : 0L;
+  long bitrate = elapsed ? (long)(((float)1000 / KILOBYTE(1)) * dataBytes / elapsed) : 0L;
  if (!IptvConfig.GetUseBytes())
     bitrate *= 8;
  cString info = cString::sprintf("Stream bitrate: %ld k%s/s\n", bitrate, IptvConfig.GetUseBytes() ? "B" : "bit");
@@ -183,7 +182,7 @@ cString cIptvBufferStatistics::GetBufferStatistic()
  cMutexLock MutexLock(&mutex);
  uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
  timer.Set();
-  long bitrate = elapsed ? (long)((float)1000 / KILOBYTE(1) * dataBytes / elapsed) : 0L;
+  long bitrate = elapsed ? (long)(((float)1000 / KILOBYTE(1)) * dataBytes / elapsed) : 0L;
  long totalSpace = MEGABYTE(IptvConfig.GetTsBufferSize());
  float percentage = (float)((float)usedSpace / (float)totalSpace * 100.0);
  long totalKilos = totalSpace / KILOBYTE(1);
--- a/statistics.h
+++ b/statistics.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: statistics.h,v 1.11 2008/01/19 21:08:03 ajhseppa Exp $
 */

 #ifndef __IPTV_STATISTICS_H
--- a/streamer.c
+++ b/streamer.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: streamer.c,v 1.30 2008/01/30 21:57:33 rahrenbe Exp $
 */

 #include <vdr/thread.h>
@@ -12,13 +11,19 @@
 #include "common.h"
 #include "streamer.h"

-cIptvStreamer::cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex)
+cIptvStreamer::cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen)
 : cThread("IPTV streamer"),
  ringBuffer(RingBuffer),
-  mutex(Mutex),
+  packetBufferLen(PacketLen),
  protocol(NULL)
 {
-  debug("cIptvStreamer::cIptvStreamer()\n");
+  debug("cIptvStreamer::cIptvStreamer(%d)\n", packetBufferLen);
+  // Allocate packet buffer
+  packetBuffer = MALLOC(unsigned char, packetBufferLen);
+  if (packetBuffer)
+     memset(packetBuffer, 0, packetBufferLen);
+  else
+     error("ERROR: MALLOC() failed for packet buffer");
 }

 cIptvStreamer::~cIptvStreamer()
@@ -26,32 +31,33 @@ cIptvStreamer::~cIptvStreamer()
  debug("cIptvStreamer::~cIptvStreamer()\n");
  // Close the protocol
  Close();
+  protocol = NULL;
+  ringBuffer = NULL;
+  // Free allocated memory
+  free(packetBuffer);
 }

 void cIptvStreamer::Action(void)
 {
  debug("cIptvStreamer::Action(): Entering\n");
+  // Increase priority
+  //SetPriority(-1);
  // Do the thread loop
-  while (Running()) {
-    if (ringBuffer && mutex && protocol && ringBuffer->Free()) {
-       unsigned char *buffer = NULL;
-       mutex->Lock();
-       int length = protocol->Read(&buffer);
-       if (length >= 0) {
-          AddStreamerStatistic(length);
-          int p = ringBuffer->Put(buffer, length);
-          if (p != length && Running())
-             ringBuffer->ReportOverflow(length - p);
-          mutex->Unlock();
-          }
-       else {
-          mutex->Unlock();
-          cCondWait::SleepMs(100); // to reduce cpu load
-          }
-       }
-    else
-       cCondWait::SleepMs(100); // and avoid busy loop
-    }
+  while (packetBuffer && Running()) {
+        int length = -1;
+        if (protocol)
+           length = protocol->Read(packetBuffer, packetBufferLen);
+        if (length > 0) {
+           AddStreamerStatistic(length);
+           if (ringBuffer) {
+              int p = ringBuffer->Put(packetBuffer, length);
+              if (p != length)
+                 ringBuffer->ReportOverflow(length - p);
+              }
+           }
+        else
+           sleep.Wait(10); // to avoid busy loop and reduce cpu load
+        }
  debug("cIptvStreamer::Action(): Exiting\n");
 }

@@ -70,18 +76,12 @@ bool cIptvStreamer::Close(void)
 {
  debug("cIptvStreamer::Close()\n");
  // Stop thread
+  sleep.Signal();
  if (Running())
     Cancel(3);
-  // Close the protocol. A mutex should be taken here to avoid a race condition
-  // where thread Action() may be in the process of accessing the protocol.
-  // Taking a mutex serializes the Close() and Action() -calls.
-  if (mutex)
-      mutex->Lock();
+  // Close the protocol
  if (protocol)
     protocol->Close();
-  if (mutex)
-     mutex->Unlock();
-
  return true;
 }

@@ -89,16 +89,17 @@ bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Ind
 {
  debug("cIptvStreamer::Set(): %s:%d\n", Location, Parameter);
  if (!isempty(Location)) {
-     // Update protocol; Close the existing one if changed
+     // Update protocol and set location and parameter; Close the existing one if changed
     if (protocol != Protocol) {
        if (protocol)
           protocol->Close();
        protocol = Protocol;
-        if (protocol)
+        if (protocol) {
+           protocol->Set(Location, Parameter, Index);
           protocol->Open();
+           }
        }
-     // Set protocol location and parameter
-     if (protocol)
+     else if (protocol)
        protocol->Set(Location, Parameter, Index);
     }
  return true;
--- a/streamer.h
+++ b/streamer.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: streamer.h,v 1.14 2008/01/30 21:57:33 rahrenbe Exp $
 */

 #ifndef __IPTV_STREAMER_H
@@ -20,15 +19,17 @@
 class cIptvStreamer : public cThread, public cIptvStreamerStatistics {
 private:
  cRingBufferLinear* ringBuffer;
-  cMutex* mutex;
-  unsigned char* readBuffer;
-  unsigned int readBufferLen;
+  cCondWait sleep;
+  unsigned char* packetBuffer;
+  unsigned int packetBufferLen;
  cIptvProtocolIf* protocol;

-public:
-  cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex);
-  virtual ~cIptvStreamer();
+protected:
  virtual void Action(void);
+
+public:
+  cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen);
+  virtual ~cIptvStreamer();
  bool Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol);
  bool Open(void);
  bool Close(void);
Author	SHA1	Message	Date
Rolf Ahrenberg	aa1bfab60d	Updated HISTORY.	2009-06-01 11:17:18 +03:00
Rolf Ahrenberg	3ffba13a6c	Updated patches for vdr-1.7.7.	2009-05-22 11:00:54 +03:00
Rolf Ahrenberg	57d63db034	Fixed setting parameters when protocol changes (Thanks to Peter Holik for reporting this one). Updated example scripts to use ffmpeg's direct UDP output and added a new "image.sh" script (Thanks to Peter Holik).	2009-05-22 10:50:20 +03:00
Rolf Ahrenberg	2484c3bdd6	Updated patches for vdr-1.7.5.	2009-04-14 12:58:09 +03:00
Rolf Ahrenberg	912bf068ac	Added iptvstream-notrap.sh script.	2009-03-31 08:17:24 +03:00
Rolf Ahrenberg	a8d01e32a1	Modified default compilation options.	2009-03-23 21:07:50 +02:00
Rolf Ahrenberg	d1c2d48a6b	Fixed remaining lint warnings.	2009-03-21 00:56:37 +02:00
Rolf Ahrenberg	e74d4f88f4	Fixed again lint warnings.	2009-03-20 23:38:26 +02:00
Rolf Ahrenberg	55bf971e3e	Fixed more lint warnings.	2009-03-20 18:00:17 +02:00
Rolf Ahrenberg	30abbc3e80	Fixed some lint warnings.	2009-03-20 17:43:31 +02:00
Rolf Ahrenberg	74761da04a	Fixed a locking bug with section filters.	2009-03-17 17:37:05 +02:00
Rolf Ahrenberg	b221a9a406	Added a note about recommended frequencies into README.	2009-03-17 08:30:57 +02:00
Rolf Ahrenberg	fd7a43d733	Added optional patches to disable CA updates.	2009-03-07 15:27:04 +02:00
Rolf Ahrenberg	d546cac834	Fixed pid scanner to set the existing video stream type.	2009-03-06 22:20:34 +02:00
Rolf Ahrenberg	94225ac6a4	Fixed pid scanner to default MPEG2 video stream type.	2009-03-06 19:30:56 +02:00
Rolf Ahrenberg	25ec9df0cc	Whitespace cleanup.	2009-03-06 19:06:47 +02:00
Rolf Ahrenberg	abf0a5ece4	Refactored section filter class.	2009-02-27 16:05:19 +02:00
Rolf Ahrenberg	024ee7ba89	Optimized TS packet data flow.	2009-02-26 16:04:12 +02:00
Rolf Ahrenberg	73906ab698	Fixed a possible crash in pid scanner.	2009-02-25 22:52:25 +02:00
Rolf Ahrenberg	ec2ec19f68	Fixed a possible crash in sid scanner.	2009-02-25 14:34:19 +02:00
Rolf Ahrenberg	1e8f117988	Updated for vdr-1.7.4. Fixed blacklisting of PAT section filter. Set max IPTV device count to VDR's max devices.	2009-02-24 13:40:16 +02:00
Rolf Ahrenberg	00cf880a5d	Updated HISTORY.	2008-12-16 17:14:45 +02:00
Rolf Ahrenberg	71472a1033	Updated for vdr-1.7.2.	2008-12-14 20:27:45 +02:00
Rolf Ahrenberg	0eff9de2ee	Silenced a warning about ignoring a return value of write().	2008-11-10 12:32:34 +02:00
Rolf Ahrenberg	9a19009451	Cleaned up Makefile header.	2008-11-04 23:29:20 +02:00
Rolf Ahrenberg	04c194ffc7	Incremented the version number.	2008-10-12 23:08:41 +03:00
Rolf Ahrenberg	40125dd9bb	Updated HISTORY for the release.	2008-10-12 22:44:17 +03:00
Rolf Ahrenberg	c5a7598544	Optimized streamer thread termination.	2008-09-10 17:22:36 +03:00
Rolf Ahrenberg	4e8e26a4b3	Updated iptvstream.sh script to support optional video resolution settings.	2008-09-01 14:28:05 +03:00
Rolf Ahrenberg	9ec10262d4	Fifo shouldn't be opened as write-only, if there're no readers.	2008-08-31 12:56:22 +03:00
Rolf Ahrenberg	501701e3d3	Added .gitignore.	2008-08-29 17:38:46 +03:00
Rolf Ahrenberg	53b5644973	Migration changes for git and UTF-8. Updated contact information.	2008-08-23 08:15:30 +03:00
Rolf Ahrenberg	17b4709c30	Tweaked pid scanner parameters for HD broadcasts.	2008-08-06 08:05:52 +00:00
Rolf Ahrenberg	2bff3d0f8f	Updated Italian translation.	2008-07-14 10:13:48 +00:00
Rolf Ahrenberg	6324eaf128	Updated HISTORY.	2008-06-20 19:34:50 +00:00
Rolf Ahrenberg	b31de2ec23	Rephrased.	2008-06-20 19:34:18 +00:00
Rolf Ahrenberg	b3b28a5faa	Initial import.	2008-06-20 19:33:43 +00:00
Rolf Ahrenberg	037adaac86	Added pluginparam patch for vdr-1.7.0.	2008-04-13 16:04:03 +00:00
Rolf Ahrenberg	6fa46ca9e3	Revert non-working retuning optimization.	2008-04-04 20:55:44 +00:00
Rolf Ahrenberg	c507f373ff	Fixed channels.conf format used in vlc2iptv. Disabled retuning feature and added some minor corrections.	2008-04-02 22:55:04 +00:00
Rolf Ahrenberg	e798ff1424	Removed old channels.conf format support and disabled re-tuning of EXT protocol.	2008-04-02 20:22:48 +00:00
Rolf Ahrenberg	613152c6db	Updated Italian translations and incremented version number.	2008-03-30 20:25:12 +00:00
Rolf Ahrenberg	740d93aa2c	Updated russian translation and API dependency.	2008-03-27 20:27:26 +00:00
Rolf Ahrenberg	94e70db977	Updated for vdr-1.6.0.	2008-03-27 20:14:18 +00:00
Rolf Ahrenberg	698ebb3a3c	Updated pluginparam patches.	2008-03-13 23:32:51 +00:00
Rolf Ahrenberg	aaf93246c1	Added Russian translation.	2008-03-13 23:26:04 +00:00
Rolf Ahrenberg	1d8044b4e4	Updated Italian translation.	2008-02-23 12:37:56 +00:00
Rolf Ahrenberg	573584022c	Fixed installation instructions.	2008-02-19 22:32:24 +00:00
Rolf Ahrenberg	5420374543	Removed obsolete patches.	2008-02-19 22:30:43 +00:00
Rolf Ahrenberg	71952ae0dc	Removed support for older vdr versions.	2008-02-19 22:29:02 +00:00