Added optional patches to disable CA updates.

Fixed blacklisting of PAT section filter.
Set max IPTV device count to VDR's max devices.

.gitignore

@@ -0,0 +1,6 @@
+.dependencies
+*.o
+*.so
+*~
+po/*.pot
+po/*.mo

HISTORY

@@ -34,7 +34,63 @@ 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.
+
+2008-02-18: Version 0.0.7
+
+- Updated for vdr-1.5.15.
+- Replaced asprintf with cString.
+- 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.

Makefile

@@ -1,7 +1,6 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for IPTV plugin
 #
-# $Id: Makefile,v 1.24 2008/01/13 16:45:02 rahrenbe Exp $
 
 # Debugging on/off 
 #IPTV_DEBUG = 1
@@ -40,9 +39,6 @@ TMPDIR = /tmp
 
 APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
-### Test whether VDR has locale support
-VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
-
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
@@ -58,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 statistics.o common.o socket.o i18n.o
+	sidscanner.o pidscanner.o statistics.o common.o socket.o
 
 ### The main target:
 
@@ -78,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)
 
@@ -89,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)
@@ -114,23 +104,7 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 	cp $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs)
+i18n: $(I18Nmsgs) $(I18Npot)
-
-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 
 
 ### Targets:
 
@@ -145,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

README

@@ -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>
+                             Antti Seppälä
-                             <a j h s e p p a @ n i k s u l a . h u t . f i >
+                             < 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
@@ -70,10 +67,6 @@ Setup menu:
 - Use section filtering = 1        Defines whether section filtering shall
                                    be used.
                                    Valid range: 0...1
-- Scan Sid automatically = 1       Defines whether service id shall be
-                                   scanned automatically. Requires section
-                                   filtering.
-                                   Valid range: 0...1
 - Disable filters = 0              Certain section filters might cause some
                                    unwanted behaviour to VDR such as time
                                    being falsely synchronized etc. This
@@ -96,6 +89,17 @@ Channel editor menu:
   pressing the Red button. The channel editor is functionally similar to
   VDR's built-in channel editor.
 
+- Scan Sid:  [yes|no]              Defines whether service id shall be
+                                   scanned automatically. Service id is
+                                   used in channel identification and
+                                   EPG information is set according to it.
+                                   This option requires section filtering.
+
+- Scan pids: [yes|no]              Defines whether video and audio pids
+                                   shall be scanned automatically. This
+                                   option is useful with streams missing
+                                   correct PAT/PMT information.
+
 Information menu:
 
 - [Red:General]                    Opens the general information page.
@@ -107,15 +111,16 @@ Configuration:
 
 - channels.conf
 
-  TV4;IPTV:4:IPTV|EXT|iptvstream.sh|0:P:0:0:680:0:0:4:0:0:0
+  TV4;IPTV:4:IPTV|S1P0|EXT|iptvstream.sh|0:P:0:0:680:0:0:4:0:0:0
-  TV3;IPTV:3:IPTV|FILE|/video/stream.ts|5:P:0:514:670:2321:0:3: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|HTTP|127.0.0.1/TS/2|3000:P:0:513:660:2321:0:2: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|UDP|127.0.0.1|1234:P:0:512:650:2321:0:1: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")
+           | |    |    |   |         |    Source type ("P")
-           | |    |   |         IP Port Number, File delay (ms), Script parameter
+           | |    |    |   |         IP Port Number, File delay (ms), Script parameter
-           | |    |   IP Address, File location, Script location
+           | |    |    |   IP Address, File location, Script location
-           | |    Protocol ("UDP", "HTTP", "FILE", "EXT")
+           | |    |    Protocol ("UDP", "HTTP", "FILE", "EXT")
+           | |    Parameters ("S" Sid scan, "P" Pid scan, "0" disable, "1" enable)
            | Plugin ID ("IPTV")
            Unique enumeration
 
@@ -158,8 +163,12 @@ Notes:
 - The following section filters are recommended to be disabled:
   "NIT (0x40)", "SDT (0x42)", "TDT (0x70)"
 
+- The IPTV devices look for a "/tmp/vdr-iptv<devicenumber>.dvr" fifo at
+  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.
+
 Acknowledgements:
 
 - The IPTV section filtering code is derived from Linux kernel.
 
-- Udo Richter's po2i18n package is used to support VDR's old i18n system.
+- The pid scanning code is derived from Udo Richter's streamplayer plugin.

common.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: common.c,v 1.9 2008/01/04 23:36:37 ajhseppa Exp $
  */
 
 #include <vdr/tools.h>
@@ -50,9 +49,9 @@ int select_single_desc(int descriptor, const int usecs, const bool selectWrite)
   FD_SET(descriptor, &fds);
   int retval = 0;
   if (selectWrite)
-    retval = select(descriptor + 1, NULL, &fds, NULL, &tv);
+     retval = select(descriptor + 1, NULL, &fds, NULL, &tv);
   else
-    retval = select(descriptor + 1, &fds, NULL, NULL, &tv);
+     retval = select(descriptor + 1, &fds, NULL, NULL, &tv);
   // Check if error
   ERROR_IF_RET(retval < 0, "select()", return retval);
   return retval;

common.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: common.h,v 1.19 2008/01/04 23:36:37 ajhseppa Exp $
  */
 
 #ifndef __IPTV_COMMON_H
@@ -29,6 +28,9 @@
 #define trVDR(s) tr(s)
 #endif
 
+#define IPTV_FILTER_FILENAME            "/tmp/vdr-iptv%d.filter%d"
+#define IPTV_DVR_FILENAME               "/tmp/vdr-iptv%d.dvr"
+
 #define IPTV_DEVICE_INFO_ALL            0
 #define IPTV_DEVICE_INFO_GENERAL        1
 #define IPTV_DEVICE_INFO_PIDS           2
@@ -39,6 +41,8 @@
 
 #define SECTION_FILTER_TABLE_SIZE       7
 
+#define TS_SYNC_BYTE                    0x47
+
 #define ERROR_IF_FUNC(exp, errstr, func, ret) \
   do {                                                                     \
      if (exp) {                                                            \

config.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: config.c,v 1.19 2008/01/04 23:36:37 ajhseppa Exp $
  */
 
 #include "config.h"
@@ -11,15 +10,13 @@
 cIptvConfig IptvConfig;
 
 cIptvConfig::cIptvConfig(void)
-: readBufferTsCount(48),
+: tsBufferSize(2),
-  tsBufferSize(2),
   tsBufferPrefillRatio(0),
   extProtocolBasePort(4321),
   useBytes(1),
-  sectionFiltering(1),
+  sectionFiltering(1)
-  sidScanning(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));
 }
@@ -27,8 +24,8 @@ cIptvConfig::cIptvConfig(void)
 unsigned int cIptvConfig::GetDisabledFiltersCount(void) const
 {
   unsigned int n = 0;
-  while ((disabledFilters[n] != -1) && (n < ARRAY_SIZE(disabledFilters) - 1))
+  while ((disabledFilters[n] != -1) && (n < ARRAY_SIZE(disabledFilters)))
-    n++;
+        n++;
   return n;
 }
 

config.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: config.h,v 1.18 2008/01/04 23:36:37 ajhseppa Exp $
  */
 
 #ifndef __IPTV_CONFIG_H
@@ -15,25 +14,21 @@
 class cIptvConfig
 {
 private:
-  unsigned int readBufferTsCount;
   unsigned int tsBufferSize;
   unsigned int tsBufferPrefillRatio;
   unsigned int extProtocolBasePort;
   unsigned int useBytes;
   unsigned int sectionFiltering;
-  unsigned int sidScanning;
   int disabledFilters[SECTION_FILTER_TABLE_SIZE];
   char configDirectory[255];
 
 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; }
   unsigned int GetUseBytes(void) const { return useBytes; }
   unsigned int GetSectionFiltering(void) const { return sectionFiltering; }
-  unsigned int GetSidScanning(void) const { return sidScanning; }
   const char *GetConfigDirectory(void) const { return configDirectory; }
   unsigned int GetDisabledFiltersCount(void) const;
   int GetDisabledFilters(unsigned int Index) const;
@@ -42,7 +37,6 @@ public:
   void SetExtProtocolBasePort(unsigned int PortNumber) { extProtocolBasePort = PortNumber; }
   void SetUseBytes(unsigned int On) { useBytes = On; }
   void SetSectionFiltering(unsigned int On) { sectionFiltering = On; }
-  void SetSidScanning(unsigned int On) { sidScanning = On; }
   void SetDisabledFilters(unsigned int Index, int Number);
   void SetConfigDirectory(const char *directoryP);
 };

device.c

@@ -3,13 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: device.c,v 1.78 2008/01/19 21:08:02 ajhseppa Exp $
  */
 
 #include "config.h"
 #include "device.h"
 
-#define IPTV_MAX_DEVICES 8
+#define IPTV_MAX_DEVICES MAXDEVICES
 
 cIptvDevice * IptvDevices[IPTV_MAX_DEVICES] = { NULL };
 
@@ -17,21 +16,25 @@ unsigned int cIptvDevice::deviceCount = 0;
 
 cIptvDevice::cIptvDevice(unsigned int Index)
 : deviceIndex(Index),
+  dvrFd(-1),
   isPacketDelivered(false),
   isOpenDvr(false),
-  mutex()
+  sidScanEnabled(false),
+  pidScanEnabled(false)
 {
-  debug("cIptvDevice::cIptvDevice(%d)\n", deviceIndex);
+  unsigned int bufsize = MEGABYTE(IptvConfig.GetTsBufferSize());
-  tsBuffer = new cRingBufferLinear(MEGABYTE(IptvConfig.GetTsBufferSize()),
+  bufsize -= (bufsize % TS_SIZE);
-                                   (TS_SIZE * IptvConfig.GetReadBufferTsCount()),
+  isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndex, CardIndex());
-                                   false, "IPTV");
+  tsBuffer = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
-  tsBuffer->SetTimeouts(100, 100);
+                                   *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));
   // Start section handler for iptv device
@@ -40,17 +43,29 @@ cIptvDevice::cIptvDevice(unsigned int Index)
   pSidScanner = new cSidScanner;
   if (pSidScanner)
      AttachFilter(pSidScanner);
+  // Check if dvr fifo exists
+  struct stat sb;
+  cString filename = cString::sprintf(IPTV_DVR_FILENAME, deviceIndex);
+  stat(filename, &sb);
+  if (S_ISFIFO(sb.st_mode)) {
+     dvrFd = open(filename, O_RDWR | O_NONBLOCK);
+     if (dvrFd >= 0)
+        dsyslog("IPTV device %d redirecting input stream to '%s'", deviceIndex, *filename);
+     }
 }
 
 cIptvDevice::~cIptvDevice()
 {
   debug("cIptvDevice::~cIptvDevice(%d)\n", deviceIndex);
+  // Stop section handler of iptv device
+  StopSectionHandler();
   DELETE_POINTER(pIptvStreamer);
   DELETE_POINTER(pUdpProtocol);
   DELETE_POINTER(pHttpProtocol);
   DELETE_POINTER(pFileProtocol);
   DELETE_POINTER(pExtProtocol);
   DELETE_POINTER(tsBuffer);
+  DELETE_POINTER(pPidScanner);
   // Detach and destroy sid filter
   if (pSidScanner) {
      Detach(pSidScanner);
@@ -59,6 +74,12 @@ cIptvDevice::~cIptvDevice()
   // Destroy all filters
   for (int i = 0; i < eMaxSecFilterCount; ++i)
       DeleteFilter(i);
+  // Close dvr fifo
+  if (dvrFd >= 0) {
+     int fd = dvrFd;
+     dvrFd = -1;
+     close(fd);
+     }
 }
 
 bool cIptvDevice::Initialize(unsigned int DeviceCount)
@@ -155,13 +176,34 @@ cString cIptvDevice::GetInformation(unsigned int Page)
   return info;
 }
 
-cString cIptvDevice::GetChannelSettings(const char *IptvParam, int *Parameter, cIptvProtocolIf* *Protocol)
+cString cIptvDevice::GetChannelSettings(const char *IptvParam, int *Parameter, int *SidScan, int *PidScan, cIptvProtocolIf* *Protocol)
 {
   debug("cIptvDevice::GetChannelSettings(%d)\n", deviceIndex);
   char *tag = NULL;
   char *proto = NULL;
   char *loc = NULL;
-  if (sscanf(IptvParam, "%a[^|]|%a[^|]|%a[^|]|%u", &tag, &proto, &loc, Parameter) == 4) {
+  if (sscanf(IptvParam, "%a[^|]|S%dP%d|%a[^|]|%a[^|]|%u", &tag, SidScan, PidScan, &proto, &loc, Parameter) == 6) {
+     cString tagstr(tag, true);
+     cString protostr(proto, true);
+     cString locstr(loc, true);
+     // 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;
+        }
+     }
+  else if (sscanf(IptvParam, "%a[^|]|P%dS%d|%a[^|]|%a[^|]|%u", &tag, PidScan, SidScan, &proto, &loc, Parameter) == 6) {
      cString tagstr(tag, true);
      cString protostr(proto, true);
      cString locstr(loc, true);
@@ -216,21 +258,31 @@ bool cIptvDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *N
   return result;
 }
 
+int cIptvDevice::NumProvidedSystems(void) const
+{
+  return 1;
+}
+
 bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-  int parameter;
+  int parameter, sidscan, pidscan;
   cString location;
   cIptvProtocolIf *protocol;
 
   debug("cIptvDevice::SetChannelDevice(%d)\n", deviceIndex);
-  location = GetChannelSettings(Channel->PluginParam(), &parameter, &protocol);
+  location = GetChannelSettings(Channel->PluginParam(), &parameter, &sidscan, &pidscan, &protocol);
   if (isempty(location)) {
      error("ERROR: Unrecognized IPTV channel settings: %s", Channel->PluginParam());
      return false;
      }
-  pIptvStreamer->Set(location, parameter, deviceIndex, protocol);
+  sidScanEnabled = sidscan ? true : false;
-  if (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
+  pidScanEnabled = pidscan ? true : false;
-     pSidScanner->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;
 }
 
@@ -281,7 +333,7 @@ int cIptvDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
   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();
          }
       }
@@ -303,13 +355,12 @@ 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)
-  if (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
+     pIptvStreamer->Open();
+  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
      pSidScanner->SetStatus(true);
   isOpenDvr = true;
   return true;
@@ -318,10 +369,10 @@ bool cIptvDevice::OpenDvr(void)
 void cIptvDevice::CloseDvr(void)
 {
   debug("cIptvDevice::CloseDvr(%d)\n", deviceIndex);
-  if (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
+  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
      pSidScanner->SetStatus(false);
   if (pIptvStreamer)
-    pIptvStreamer->Close();
+     pIptvStreamer->Close();
   isOpenDvr = false;
 }
 
@@ -354,7 +405,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;
@@ -376,18 +427,24 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
            }
         isPacketDelivered = true;
         Data = p;
-	// Update pid statistics 
+        // Update pid statistics
-	AddPidStatistic(ts_pid(p), payload(p));
+        AddPidStatistic(ts_pid(p), payload(p));
+        // Send data also to dvr fifo
+        if (dvrFd >= 0)
+           Count = write(dvrFd, p, TS_SIZE);
+        // Analyze incomplete streams with built-in pid analyzer
+        if (pidScanEnabled && pPidScanner)
+           pPidScanner->Process(p);
         // 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;
 }

device.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: device.h,v 1.35 2008/01/04 23:36:37 ajhseppa Exp $
  */
 
 #ifndef __IPTV_DEVICE_H
@@ -17,6 +16,7 @@
 #include "protocolext.h"
 #include "streamer.h"
 #include "sectionfilter.h"
+#include "pidscanner.h"
 #include "sidscanner.h"
 #include "statistics.h"
 
@@ -34,8 +34,11 @@ private:
     eMaxSecFilterCount = 32
   };
   unsigned int deviceIndex;
+  int dvrFd;
   bool isPacketDelivered;
   bool isOpenDvr;
+  bool sidScanEnabled;
+  bool pidScanEnabled;
   cRingBufferLinear *tsBuffer;
   int tsBufferPrefill;
   cIptvProtocolUdp *pUdpProtocol;
@@ -43,6 +46,7 @@ private:
   cIptvProtocolFile *pFileProtocol;
   cIptvProtocolExt *pExtProtocol;
   cIptvStreamer *pIptvStreamer;
+  cPidScanner *pPidScanner;
   cSidScanner *pSidScanner;
   cMutex mutex;
   cIptvSectionFilter* secfilters[eMaxSecFilterCount];
@@ -65,7 +69,7 @@ private:
 
   // for channel parsing & buffering
 private:
-  cString GetChannelSettings(const char *IptvParam, int *Parameter, cIptvProtocolIf* *Protocol);
+  cString GetChannelSettings(const char *IptvParam, int *Parameter, int *SidScan, int *PidScan, cIptvProtocolIf* *Protocol);
   bool ProvidesIptv(const char *Param) const;
   void ResetBuffering(void);
   bool IsBuffering(void);
@@ -77,6 +81,7 @@ public:
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual int NumProvidedSystems(void) const;
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 

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

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

iptv.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: iptv.c,v 1.33 2008/01/19 20:24:10 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)
+#if defined(APIVERSNUM) && APIVERSNUM < 10600
-#error "You must apply the closefilter patch for VDR!"
+#error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-static const char VERSION[]     = "0.0.6";
+static const char VERSION[]     = "0.2.5";
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {
@@ -79,20 +77,20 @@ bool cPluginIptv::ProcessArgs(int argc, char *argv[])
   debug("cPluginIptv::ProcessArgs()\n");
   // Implement command line argument processing here if applicable.
   static const struct option long_options[] = {
-       { "devices", required_argument, NULL, 'd' },
+    { "devices", required_argument, NULL, 'd' },
-       { NULL }
+    { NULL }
-     };
+    };
 
   int c;
   while ((c = getopt_long(argc, argv, "d:", long_options, NULL)) != -1) {
-        switch (c) {
+    switch (c) {
-          case 'd':
+      case 'd':
-               deviceCount = atoi(optarg);
+           deviceCount = atoi(optarg);
-               break;
+           break;
-          default:
+      default:
-               return false;
+           return false;
-          }
+      }
-        }
+    }
   return true;
 }
 
@@ -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);
 }
@@ -167,14 +162,14 @@ int cPluginIptv::ParseFilters(const char *Value, int *Filters)
   char buffer[256];
   int n = 0;
   while (Value && *Value && (n < SECTION_FILTER_TABLE_SIZE)) {
-        strn0cpy(buffer, Value, sizeof(buffer));
+    strn0cpy(buffer, Value, sizeof(buffer));
-        int i = atoi(buffer);
+    int i = atoi(buffer);
-        //debug("cPluginIptv::ParseFilters(): Filters[%d]=%d\n", n, i);
+    //debug("cPluginIptv::ParseFilters(): Filters[%d]=%d\n", n, i);
-        if (i >= 0)
+    if (i >= 0)
-           Filters[n++] = i;
+       Filters[n++] = i;
-        if ((Value = strchr(Value, ' ')) != NULL)
+    if ((Value = strchr(Value, ' ')) != NULL)
-           Value++;
+       Value++;
-        }
+    }
   return n;
 }
 
@@ -190,8 +185,6 @@ bool cPluginIptv::SetupParse(const char *Name, const char *Value)
      IptvConfig.SetExtProtocolBasePort(atoi(Value));
   else if (!strcasecmp(Name, "SectionFiltering"))
      IptvConfig.SetSectionFiltering(atoi(Value));
-  else if (!strcasecmp(Name, "SidScanning"))
-     IptvConfig.SetSidScanning(atoi(Value));
   else if (!strcasecmp(Name, "DisabledFilters")) {
      int DisabledFilters[SECTION_FILTER_TABLE_SIZE];
      for (unsigned int i = 0; i < ARRAY_SIZE(DisabledFilters); ++i)

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 \
+  - | nc -u 127.0.0.1 ${PORT}
+
+rm -f "${FIFO}"
+} > ${LOG} 2>&1

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=${!}
 

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 \
+  - | nc -nu 127.0.0.1 ${PORT}
+} > ${LOG} 2>&1

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"
 

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 \
+  - | nc -u 127.0.0.1 ${PORT}
+
+rm -f "${FIFO}"
+} > ${LOG} 2>&1

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;
-             }

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));

patches/vdr-1.6.0-pluginparam.patch

@@ -1,6 +1,6 @@
-diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
+diff -Nru vdr-1.6.0-vanilla/channels.c vdr-1.6.0-pluginparam/channels.c
---- vdr-1.5.13-vanilla/channels.c	2008-01-13 17:31:25.000000000 +0200
+--- vdr-1.6.0-vanilla/channels.c	2008-03-27 21:43:25.000000000 +0200
-+++ vdr-1.5.13-pluginparam/channels.c	2008-01-20 02:00:08.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("");
@@ -44,17 +44,17 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c
 +bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam)
 +{
 +  if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) {
-+       if (Number()) {
++     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);
++        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;
++        modification |= CHANNELMOD_TRANSP;
-+          Channels.SetModified();
++        Channels.SetModified();
-+          }
++        }
-+       source = Source;
++     source = Source;
-+       frequency = Frequency;
++     frequency = Frequency;
-+       pluginParam = strcpyrealloc(pluginParam, PluginParam);
++     pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+       schedule = NULL;
++     schedule = NULL;
-+       }
++     }
-+    return true;
++  return true;
 +}
 +
  bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
@@ -122,9 +122,9 @@ 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
+diff -Nru vdr-1.6.0-vanilla/channels.h vdr-1.6.0-pluginparam/channels.h
---- vdr-1.5.13-vanilla/channels.h	2008-01-13 17:31:25.000000000 +0200
+--- vdr-1.6.0-vanilla/channels.h	2008-03-27 21:43:25.000000000 +0200
-+++ vdr-1.5.13-pluginparam/channels.h	2008-01-20 02:00:08.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,22 +164,22 @@ diff -Nru vdr-1.5.13-vanilla/channels.h vdr-1.5.13-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.13-vanilla/config.h vdr-1.5.13-pluginparam/config.h
+diff -Nru vdr-1.6.0-vanilla/config.h vdr-1.6.0-pluginparam/config.h
---- vdr-1.5.13-vanilla/config.h	2008-01-13 17:31:25.000000000 +0200
+--- vdr-1.6.0-vanilla/config.h	2008-03-27 21:43:25.000000000 +0200
-+++ vdr-1.5.13-pluginparam/config.h	2008-01-20 02:00:08.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.13"
+ #define APIVERSION  "1.6.0"
- #define APIVERSNUM   10513  // Version * 10000 + Major * 100 + Minor
+ #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.13-vanilla/menu.c vdr-1.5.13-pluginparam/menu.c
+diff -Nru vdr-1.6.0-vanilla/menu.c vdr-1.6.0-pluginparam/menu.c
---- vdr-1.5.13-vanilla/menu.c	2008-01-13 17:31:25.000000000 +0200
+--- vdr-1.6.0-vanilla/menu.c	2008-03-27 21:43:25.000000000 +0200
-+++ vdr-1.5.13-pluginparam/menu.c	2008-01-20 02:00:08.000000000 +0200
++++ vdr-1.6.0-pluginparam/menu.c	2008-03-27 22:06:47.000000000 +0200
-@@ -219,6 +219,7 @@
+@@ -253,6 +253,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 @@
+@@ -285,6 +286,7 @@
  
    // Parameters for all types of sources:
    strn0cpy(name, data.name, sizeof(name));
@@ -195,7 +195,7 @@ 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 @@
+@@ -315,6 +317,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")));
@@ -203,7 +203,7 @@ diff -Nru vdr-1.5.13-vanilla/menu.c vdr-1.5.13-pluginparam/menu.c
  
    SetCurrent(Get(current));
    Display();
-@@ -295,6 +298,7 @@
+@@ -329,6 +332,7 @@
       if (Key == kOk) {
          if (Channels.HasUniqueChannelID(&data, channel)) {
             data.name = strcpyrealloc(data.name, name);
@@ -211,9 +211,9 @@ 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
+diff -Nru vdr-1.6.0-vanilla/po/fi_FI.po vdr-1.6.0-pluginparam/po/fi_FI.po
---- vdr-1.5.13-vanilla/po/fi_FI.po	2008-01-13 17:31:25.000000000 +0200
+--- vdr-1.6.0-vanilla/po/fi_FI.po	2008-03-27 21:43:25.000000000 +0200
-+++ vdr-1.5.13-pluginparam/po/fi_FI.po	2008-01-20 02:00:08.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,19 @@ diff -Nru vdr-1.5.13-vanilla/po/fi_FI.po vdr-1.5.13-pluginparam/po/fi_FI.po
 +
 +msgid "Parameters"
 +msgstr "Parametrit"
-diff -Nru vdr-1.5.13-vanilla/sources.c vdr-1.5.13-pluginparam/sources.c
+diff -Nru vdr-1.6.0-vanilla/po/fr_FR.po vdr-1.6.0-pluginparam/po/fr_FR.po
---- vdr-1.5.13-vanilla/sources.c	2008-01-13 17:31:25.000000000 +0200
+--- vdr-1.6.0-vanilla/po/fr_FR.po	2008-03-27 21:43:25.000000000 +0200
-+++ vdr-1.5.13-pluginparam/sources.c	2008-01-20 02:00:08.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"
+ msgstr "VDR s'arrêtera dans %s minutes"
++
++msgid "Parameters"
++msgstr "Paramètres"
+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;
@@ -240,9 +250,9 @@ 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
+diff -Nru vdr-1.6.0-vanilla/sources.conf vdr-1.6.0-pluginparam/sources.conf
---- vdr-1.5.13-vanilla/sources.conf	2008-01-13 17:31:25.000000000 +0200
+--- vdr-1.6.0-vanilla/sources.conf	2008-03-27 21:43:25.000000000 +0200
-+++ vdr-1.5.13-pluginparam/sources.conf	2008-01-20 02:00:08.000000000 +0200
++++ vdr-1.6.0-pluginparam/sources.conf	2008-03-27 22:06:47.000000000 +0200
 @@ -188,3 +188,7 @@
  # Terrestrial
  
@@ -251,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
+diff -Nru vdr-1.6.0-vanilla/sources.h vdr-1.6.0-pluginparam/sources.h
---- vdr-1.5.13-vanilla/sources.h	2008-01-13 17:31:25.000000000 +0200
+--- vdr-1.6.0-vanilla/sources.h	2008-03-27 21:43:25.000000000 +0200
-+++ vdr-1.5.13-pluginparam/sources.h	2008-01-20 02:00:08.000000000 +0200
++++ vdr-1.6.0-pluginparam/sources.h	2008-03-27 22:06:47.000000000 +0200
 @@ -16,10 +16,11 @@
  public:
    enum eSourceType {

patches/vdr-1.7.4-disable-ca-updates.patch

@@ -0,0 +1,11 @@
+diff -Nru vdr-1.7.4-vanilla/pat.c vdr-1.7.4-disable-ca-updates/pat.c
+--- vdr-1.7.4-vanilla/pat.c	2008-07-06 17:01:32.000000000 +0300
++++ vdr-1.7.4-disable-ca-updates/pat.c	2009-03-07 14:54:12.000000000 +0200
+@@ -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));

patches/vdr-1.7.4-pluginparam.patch

@@ -1,15 +1,15 @@
-diff -Nru vdr-1.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c
+diff -Nru vdr-1.7.4-vanilla/channels.c vdr-1.7.4-pluginparam/channels.c
---- vdr-1.4.7-vanilla/channels.c	2007-10-27 01:08:39.000000000 +0300
+--- vdr-1.7.4-vanilla/channels.c	2009-01-26 11:44:48.000000000 +0200
-+++ vdr-1.4.7-pluginparam/channels.c	2007-10-27 01:09:05.000000000 +0300
++++ vdr-1.7.4-pluginparam/channels.c	2009-02-24 13:31:33.000000000 +0200
-@@ -166,6 +166,7 @@
+@@ -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;
+   bandwidth    = 8000000;
-@@ -187,6 +188,7 @@
+@@ -211,6 +212,7 @@
    shortName = NULL;
    provider = NULL;
    portalName = NULL;
@@ -17,7 +17,7 @@ diff -Nru vdr-1.4.7-vanilla/channels.c vdr-1.4.7-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.4.7-vanilla/channels.c vdr-1.4.7-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.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c
    memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
    return *this;
  }
-@@ -280,9 +284,26 @@
+@@ -306,9 +310,26 @@
-      transmission = Channel->transmission;
       guard        = Channel->guard;
       hierarchy    = Channel->hierarchy;
+      rollOff      = Channel->rollOff;
 +     if (IsPlug())  pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam);
       }
  }
@@ -44,23 +44,23 @@ diff -Nru vdr-1.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c
 +bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam)
 +{
 +  if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) {
-+       if (Number()) {
++     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);
++        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;
++        modification |= CHANNELMOD_TRANSP;
-+          Channels.SetModified();
++        Channels.SetModified();
-+          }
++        }
-+       source = Source;
++     source = Source;
-+       frequency = Frequency;
++     frequency = Frequency;
-+       pluginParam = strcpyrealloc(pluginParam, PluginParam);
++     pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+       schedule = NULL;
++     schedule = NULL;
-+       }
++     }
-+    return true;
++  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.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c
  #define STRDIFF 0x01
  #define VALDIFF 0x02
  
-@@ -579,7 +612,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.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c
    char *q = buffer;
    *q = 0;
    ST(" S ")  q += sprintf(q, "%c", polarization);
-@@ -591,6 +624,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;
  }
  
-@@ -612,7 +646,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;
+@@ -792,7 +826,7 @@
-@@ -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, '+');
+            char *p;
-            if (p)
+            if ((p = strchr(vpidbuf, '=')) != NULL) {
-@@ -813,6 +847,7 @@
+@@ -887,6 +921,7 @@
             shortName = strcpyrealloc(shortName, p);
             }
          name = strcpyrealloc(name, namebuf);
@@ -122,10 +122,10 @@ diff -Nru vdr-1.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c
  
          free(parambuf);
          free(sourcebuf);
-diff -Nru vdr-1.4.7-vanilla/channels.h vdr-1.4.7-pluginparam/channels.h
+diff -Nru vdr-1.7.4-vanilla/channels.h vdr-1.7.4-pluginparam/channels.h
---- vdr-1.4.7-vanilla/channels.h	2007-10-27 01:08:39.000000000 +0300
+--- vdr-1.7.4-vanilla/channels.h	2009-01-26 11:44:48.000000000 +0200
-+++ vdr-1.4.7-pluginparam/channels.h	2007-10-27 01:12:37.000000000 +0300
++++ vdr-1.7.4-pluginparam/channels.h	2009-02-24 13:31:33.000000000 +0200
-@@ -114,6 +114,7 @@
+@@ -116,6 +116,7 @@
    char *shortName;
    char *provider;
    char *portalName;
@@ -133,7 +133,7 @@ diff -Nru vdr-1.4.7-vanilla/channels.h vdr-1.4.7-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,77 +141,45 @@ diff -Nru vdr-1.4.7-vanilla/channels.h vdr-1.4.7-pluginparam/channels.h
    int Source(void) const { return source; }
    int Srate(void) const { return srate; }
    int Vpid(void) const { return vpid; }
-@@ -198,6 +200,7 @@
+@@ -208,6 +210,7 @@
-   int Hierarchy(void) const { return hierarchy; }
+   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); }
-@@ -205,12 +208,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 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.4.7-vanilla/config.h vdr-1.4.7-pluginparam/config.h
+diff -Nru vdr-1.7.4-vanilla/config.h vdr-1.7.4-pluginparam/config.h
---- vdr-1.4.7-vanilla/config.h	2007-10-27 01:08:39.000000000 +0300
+--- vdr-1.7.4-vanilla/config.h	2009-01-26 11:44:48.000000000 +0200
-+++ vdr-1.4.7-pluginparam/config.h	2007-10-27 01:14:39.000000000 +0300
++++ vdr-1.7.4-pluginparam/config.h	2009-02-24 13:31:33.000000000 +0200
-@@ -29,6 +29,8 @@
+@@ -30,6 +30,8 @@
- #define APIVERSION  "1.4.5"
+ #define APIVERSION  "1.7.4"
- #define APIVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
+ #define APIVERSNUM   10704  // 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
+diff -Nru vdr-1.7.4-vanilla/menu.c vdr-1.7.4-pluginparam/menu.c
---- vdr-1.4.7-vanilla/i18n.c	2007-10-27 01:08:39.000000000 +0300
+--- vdr-1.7.4-vanilla/menu.c	2009-01-26 11:44:48.000000000 +0200
-+++ vdr-1.4.7-pluginparam/i18n.c	2007-10-27 01:11:38.000000000 +0300
++++ vdr-1.7.4-pluginparam/menu.c	2009-02-24 13:31:33.000000000 +0200
-@@ -6126,6 +6126,28 @@
+@@ -190,6 +190,7 @@
-     "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];
@@ -219,23 +187,23 @@ diff -Nru vdr-1.4.7-vanilla/menu.c vdr-1.4.7-pluginparam/menu.c
    void Setup(void);
  public:
    cMenuEditChannel(cChannel *Channel, bool New = false);
-@@ -248,6 +249,7 @@
+@@ -222,6 +223,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 cMenuEditStrItem( tr("Name"),          name, sizeof(name)));
    Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
    Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
-@@ -276,6 +278,7 @@
+@@ -254,6 +256,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("  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();
-@@ -290,6 +293,7 @@
+@@ -268,6 +271,7 @@
       if (Key == kOk) {
          if (Channels.HasUniqueChannelID(&data, channel)) {
             data.name = strcpyrealloc(data.name, name);
@@ -243,9 +211,29 @@ diff -Nru vdr-1.4.7-vanilla/menu.c vdr-1.4.7-pluginparam/menu.c
             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
+diff -Nru vdr-1.7.4-vanilla/po/fi_FI.po vdr-1.7.4-pluginparam/po/fi_FI.po
---- vdr-1.4.7-vanilla/sources.c	2007-10-27 01:08:39.000000000 +0300
+--- vdr-1.7.4-vanilla/po/fi_FI.po	2009-01-26 11:44:48.000000000 +0200
-+++ vdr-1.4.7-pluginparam/sources.c	2007-10-27 01:09:20.000000000 +0300
++++ vdr-1.7.4-pluginparam/po/fi_FI.po	2009-02-24 13:31:33.000000000 +0200
+@@ -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.7.4-vanilla/po/fr_FR.po vdr-1.7.4-pluginparam/po/fr_FR.po
+--- vdr-1.7.4-vanilla/po/fr_FR.po	2009-01-26 11:44:48.000000000 +0200
++++ vdr-1.7.4-pluginparam/po/fr_FR.po	2009-02-24 13:31:33.000000000 +0200
+@@ -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.7.4-vanilla/sources.c vdr-1.7.4-pluginparam/sources.c
+--- vdr-1.7.4-vanilla/sources.c	2009-01-26 11:44:48.000000000 +0200
++++ vdr-1.7.4-pluginparam/sources.c	2009-02-24 13:31:33.000000000 +0200
 @@ -37,6 +37,7 @@
    char buffer[16];
    char *q = buffer;
@@ -262,10 +250,10 @@ diff -Nru vdr-1.4.7-vanilla/sources.c vdr-1.4.7-pluginparam/sources.c
      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
+diff -Nru vdr-1.7.4-vanilla/sources.conf vdr-1.7.4-pluginparam/sources.conf
---- vdr-1.4.7-vanilla/sources.conf	2007-10-27 01:08:39.000000000 +0300
+--- vdr-1.7.4-vanilla/sources.conf	2009-01-26 11:44:48.000000000 +0200
-+++ vdr-1.4.7-pluginparam/sources.conf	2007-10-27 01:09:20.000000000 +0300
++++ vdr-1.7.4-pluginparam/sources.conf	2009-02-24 13:31:33.000000000 +0200
-@@ -188,3 +188,7 @@
+@@ -194,3 +194,7 @@
  # Terrestrial
  
  T       Terrestrial
@@ -273,9 +261,9 @@ diff -Nru vdr-1.4.7-vanilla/sources.conf vdr-1.4.7-pluginparam/sources.conf
 +# Plugin
 +
 +P       Plugin
-diff -Nru vdr-1.4.7-vanilla/sources.h vdr-1.4.7-pluginparam/sources.h
+diff -Nru vdr-1.7.4-vanilla/sources.h vdr-1.7.4-pluginparam/sources.h
---- vdr-1.4.7-vanilla/sources.h	2007-10-27 01:08:40.000000000 +0300
+--- vdr-1.7.4-vanilla/sources.h	2009-01-26 11:44:48.000000000 +0200
-+++ vdr-1.4.7-pluginparam/sources.h	2007-10-27 01:09:20.000000000 +0300
++++ vdr-1.7.4-pluginparam/sources.h	2009-02-24 13:31:33.000000000 +0200
 @@ -16,10 +16,11 @@
  public:
    enum eSourceType {

pidscanner.c

@@ -0,0 +1,161 @@
+/*
+ * pidscanner.c: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include "common.h"
+#include "pidscanner.h"
+
+#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      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),
+  process(true),
+  Vpid(0xFFFF),
+  Apid(0xFFFF),
+  numVpids(0),
+  numApids(0)
+{
+  debug("cPidScanner::cPidScanner()\n");
+  channel = cChannel();
+}
+
+cPidScanner::~cPidScanner() 
+{
+  debug("cPidScanner::~cPidScanner()\n");
+}
+
+void cPidScanner::SetChannel(const cChannel *Channel)
+{
+  if (Channel) {
+     debug("cPidScanner::SetChannel(): %s\n", Channel->PluginParam());
+     channel = *Channel;
+     }
+  else {
+     debug("cPidScanner::SetChannel()\n");
+     channel = cChannel();
+     }
+  Vpid = 0xFFFF;
+  numVpids = 0;
+  Apid = 0xFFFF;
+  numApids = 0;
+  process = true;
+  timeout.Set(PIDSCANNER_TIMEOUT_IN_MS);
+}
+
+void cPidScanner::Process(const uint8_t* buf)
+{
+  //debug("cPidScanner::Process()\n");
+  if (!process)
+     return;
+
+  // Stop scanning after defined timeout
+  if (timeout.TimedOut()) {
+     debug("cPidScanner::Process: Timed out determining pids\n");
+     process = false;
+  }
+
+  // Verify TS packet
+  if (buf[0] != 0x47) {
+     error("Not TS packet: 0x%X\n", buf[0]);
+     return;
+     }
+
+  // Found TS packet
+  int pid = ts_pid(buf);
+  int xpid = (buf[1] << 8 | buf[2]);
+
+  // Check if payload available
+  uint8_t count = payload(buf);
+  if (count == 0)
+     return;
+
+  if (xpid & 0x4000) {
+     // Stream start (Payload Unit Start Indicator)
+     uchar *d = (uint8_t*)buf;
+     d += 4;
+     // pointer to payload
+     if (buf[3] & 0x20)
+        d += d[0] + 1;
+     // Skip adaption field
+     if (buf[3] & 0x10) {
+        // Payload present
+        if ((d[0] == 0) && (d[1] == 0) && (d[2] == 1)) {
+           // PES packet start
+           int sid = d[3];
+           // Stream ID
+           if ((sid >= 0xC0) && (sid <= 0xDF)) {
+              if (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("cPidScanner::Process: Incrementing Apids, now at %d\n", numApids);
+                 }
+              }
+           else if ((sid >= 0xE0) && (sid <= 0xEF)) {
+              if (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("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)) {
+           // Lock channels for pid updates
+           if (!Channels.Lock(true, 10)) {
+              timeout.Set(PIDSCANNER_TIMEOUT_IN_MS);
+              return;
+              }
+           cChannel *IptvChannel = Channels.GetByChannelID(channel.GetChannelID());
+           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;
+           }
+        }
+     }
+}

pidscanner.h

@@ -0,0 +1,31 @@
+/*
+ * pidscanner.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __PIDSCANNER_H
+#define __PIDSCANNER_H
+
+#include <vdr/tools.h>
+#include <vdr/channels.h>
+
+class cPidScanner {
+private:
+  cTimeMs timeout;
+  cChannel channel;
+  bool process;
+  int Vpid;
+  int Apid;
+  int numVpids;
+  int numApids;
+
+public:
+  cPidScanner(void);
+  ~cPidScanner();
+  void SetChannel(const cChannel *Channel);
+  void Process(const uint8_t* buf);
+};
+
+#endif // __PIDSCANNER_H

po/de_DE.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.0.6\n"
+"Project-Id-Version: iptv 0.2.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-01-20 16:10+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"
@@ -70,6 +70,15 @@ msgstr "Adresse"
 msgid "Port"
 msgstr "Port"
 
+msgid "Scan Sid"
+msgstr "Scanne SID"
+
+msgid "Scan pids"
+msgstr "Scanne PIDS"
+
+msgid "Vtype"
+msgstr "Vtype"
+
 msgid "Nid"
 msgstr "Nid"
 
@@ -140,15 +149,6 @@ msgid ""
 "Enabling this feature does not affect streams that do not contain section data."
 msgstr ""
 
-msgid "Scan Sid automatically"
-msgstr "Scanne SID automatisch"
-
-msgid ""
-"Define whether the service id shall be scanned automatically.\n"
-"\n"
-"Requires the section filtering. Automatic Sid scanning helps VDR to detect changed pids of streams."
-msgstr ""
-
 msgid "Disable filters"
 msgstr "Deaktiviere Filter"
 

po/fi_FI.po

@@ -5,14 +5,14 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.0.6\n"
+"Project-Id-Version: iptv 0.2.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-01-20 15:37+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)"
@@ -69,17 +69,26 @@ msgstr "Osoite"
 msgid "Port"
 msgstr "Portti"
 
+msgid "Scan Sid"
+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"
@@ -110,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"
@@ -134,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"
@@ -147,41 +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"
+"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<EFBFBD>hetteeseen, jossa ei ole sektioita."
+"Toiminto ei vaikuta lähetteeseen, jossa ei ole sektioita."
-
-msgid "Scan Sid automatically"
-msgstr "Etsi palvelu-ID automaattisesti"
-
-msgid ""
-"Define whether the service id shall be scanned automatically.\n"
-"\n"
-"Requires the section filtering. Automatic Sid scanning helps VDR to detect changed pids of streams."
-msgstr ""
-"M<><4D>rittele etsit<69><74>nk<6E> palvelutunniste (SID) automaattisesti.\n"
-"\n"
-"Asetus vaatii suodatuksen k<>ytt<74><74>noton sektioille. Automaattinen palvelutunnisteen (SID) etsint<6E> auttaa VDR:<3A><> havaitsemaan ohjelmatunnisteiden (PID) muutokset l<>hetteest<73>."
 
 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"

po/fr_FR.po

@@ -2,14 +2,15 @@
 # Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
 # Bruno ROUSSEL <bruno.roussel@free.fr>, 2007.
+# NIVAL Michaël <mnival@club-internet.fr>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: iptv 0.0.6\n"
+"Project-Id-Version: iptv 0.2.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-01-20 16:10+0200\n"
+"POT-Creation-Date: 2009-03-06 22:15+0200\n"
-"PO-Revision-Date: 2007-11-07 20:18+0100\n"
+"PO-Revision-Date: 2008-01-26 13:14+0100\n"
-"Last-Translator: Bruno ROUSSEL <bruno.roussel@free.fr>\n"
+"Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -70,6 +71,15 @@ msgstr "Adresse"
 msgid "Port"
 msgstr "Port"
 
+msgid "Scan Sid"
+msgstr "Scanne les SID"
+
+msgid "Scan pids"
+msgstr "Scanne les PID"
+
+msgid "Vtype"
+msgstr "Vtype"
+
 msgid "Nid"
 msgstr "Nid"
 
@@ -111,6 +121,9 @@ msgid ""
 "\n"
 "Smaller sizes help memory consumption, but are more prone to buffer overflows."
 msgstr ""
+"Définit la taille du ringbuffer pour le transport du flux en megabytes.\n"
+"\n"
+"Une taille plus petite taille aide la consommation de mémoire, mais c'est sujet à plus de débordement de tampon."
 
 msgid "TS buffer prefill ratio [%]"
 msgstr "Taux du buffer de pré-remplissage TS [%]"
@@ -120,6 +133,9 @@ msgid ""
 "\n"
 "This is useful if streaming media over a slow or unreliable connection."
 msgstr ""
+"Définit le ratio de pré-remplissage du ringbuffer pour le transport du flux avant transfert dans VDR.\n"
+"\n"
+"Cette option est utile si le streaming est sur une connexion lente ou peu fiables."
 
 msgid "EXT protocol base port"
 msgstr "Port de base du protocole EXT"
@@ -129,6 +145,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 ""
+"Définit le port de base utilisé par le protocole EXT.\n"
+"\n"
+"La plage de port est défini par le nombre de dispositif IPTV. Ce paramètre défini le port qui est écouté pour les connexions à partir d'applications externes en utilisant le protocole EXT."
 
 msgid "Use section filtering"
 msgstr "Utiliser le filtrage de section"
@@ -139,15 +158,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 ""
-
+"Définit si la section de filtrage doit être utilisé.\n"
-msgid "Scan Sid automatically"
-msgstr "Scanne les SID automatiquement"
-
-msgid ""
-"Define whether the service id shall be scanned automatically.\n"
 "\n"
-"Requires the section filtering. Automatic Sid scanning helps VDR to detect changed pids of streams."
+"La section filtrage signifie que le plugin IPTV essayera d'analyser et de fournir à VDR des données secondaires disponible sur le flux. VDR peut alors utiliser ces données pour fournir des fonctionnalitées supplémentaires tel que la détection de changement de pid et d'EPG etc.\n"
-msgstr ""
+"L'activation de cette fonctionnalité n'a pas d'incidence sur les flux qui ne contiennent pas de données de la section."
 
 msgid "Disable filters"
 msgstr "Désactiver les filtres"
@@ -157,13 +171,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 ""
+"Définit le numéro de section de filtrage qui sont désactivé.\n"
+"\n"
+"Certains filtrage de section peux engendrer des comportement indésirables. Blacklist les filtres qui seront laissé intact pour VDR."
 
 #. TRANSLATORS: note the singular!
 msgid "Disable filter"
 msgstr "Désactiver le filtre"
 
 msgid "Define an ill-behaving filter to be blacklisted."
-msgstr ""
+msgstr "Définit les mauvais comportement qui doivent être désactivé."
 
 msgid "Help"
 msgstr "Aide"

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.6\n"
+"Project-Id-Version: iptv 0.2.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-01-20 16:10+0200\n"
+"POT-Creation-Date: 2009-03-06 22:15+0200\n"
-"PO-Revision-Date: 2008-01-13 16:46+0100\n"
+"PO-Revision-Date: 2008-07-13 03:28+0100\n"
-"Last-Translator: Gringo <vdr-italian@tiscali.it>\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"
@@ -70,6 +70,15 @@ msgstr "Indirizzo"
 msgid "Port"
 msgstr "Porta"
 
+msgid "Scan Sid"
+msgstr "Scansione Sid"
+
+msgid "Scan pids"
+msgstr "Scansione Pids"
+
+msgid "Vtype"
+msgstr "Vtype"
+
 msgid "Nid"
 msgstr "Nid"
 
@@ -111,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"
@@ -129,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"
@@ -139,15 +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"
-msgid "Scan Sid automatically"
-msgstr "Scansione Sid automatica"
-
-msgid ""
-"Define whether the service id shall be scanned automatically.\n"
 "\n"
-"Requires the section filtering. Automatic Sid scanning helps VDR to detect changed pids of streams."
+"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"
-msgstr ""
+"Abilitare questa funzione non influisce sui flussi che non contengono dati di sezione."
 
 msgid "Disable filters"
 msgstr "Disabilita filtri"
@@ -157,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"

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 "Справка"

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; 
-    }    
-}

protocolext.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolext.c,v 1.22 2008/01/06 20:19:02 rahrenbe Exp $
  */
 
 #include <sys/wait.h>
@@ -22,11 +21,10 @@
 
 cIptvProtocolExt::cIptvProtocolExt()
 : pid(-1),
+  scriptFile(""),
   scriptParameter(0)
 {
   debug("cIptvProtocolExt::cIptvProtocolExt()\n");
-  scriptFile = strdup("");
-  listenAddr = strdup("127.0.0.1");
 }
 
 cIptvProtocolExt::~cIptvProtocolExt()
@@ -34,9 +32,6 @@ cIptvProtocolExt::~cIptvProtocolExt()
   debug("cIptvProtocolExt::~cIptvProtocolExt()\n");
   // Drop the socket connection
   cIptvProtocolExt::Close();
-  // Free allocated memory
-  free(scriptFile);
-  free(listenAddr);
 }
 
 void cIptvProtocolExt::ExecuteScript(void)
@@ -56,15 +51,12 @@ void cIptvProtocolExt::ExecuteScript(void)
      for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
          close(i);
      // Execute the external script
-     char* cmd = NULL;
+     cString cmd = cString::sprintf("%s %d %d", *scriptFile, scriptParameter, socketPort);
-     asprintf(&cmd, "%s %d %d", scriptFile, scriptParameter, socketPort);
+     debug("cIptvProtocolExt::ExecuteScript(child): %s\n", *cmd);
-     debug("cIptvProtocolExt::ExecuteScript(child): %s\n", cmd);
+     if (execl("/bin/sh", "sh", "-c", *cmd, NULL) == -1) {
-     if (execl("/bin/sh", "sh", "-c", cmd, NULL) == -1) {
+        error("ERROR: Script execution failed: %s", *cmd);
-        error("ERROR: Script execution failed: %s", cmd);
-        free(cmd);
         _exit(-1);
         }
-     free(cmd);
      _exit(0);
      }
   else {
@@ -87,7 +79,7 @@ void cIptvProtocolExt::TerminateScript(void)
        retval = 0;
        waitms += timeoutms;
        if ((waitms % 2000) == 0) {
-          error("ERROR: Script '%s' won't terminate - killing it!", scriptFile);
+          error("ERROR: Script '%s' won't terminate - killing it!", *scriptFile);
           kill(pid, SIGKILL);
           }
        // Clear wait status to make sure child exit status is accessible
@@ -115,7 +107,7 @@ bool cIptvProtocolExt::Open(void)
   debug("cIptvProtocolExt::Open()\n");
   // Reject empty script files
   if (!strlen(scriptFile))
-      return false;
+     return false;
   // Create the listening socket
   OpenSocket(socketPort);
   // Execute the external script
@@ -135,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)
@@ -146,10 +138,9 @@ bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int
   if (!isempty(Location)) {
      struct stat stbuf;
      // Update script file and parameter
-     free(scriptFile);
+     scriptFile = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), Location);
-     asprintf(&scriptFile, "%s/%s", IptvConfig.GetConfigDirectory(), Location);
      if ((stat(scriptFile, &stbuf) != 0) || (strstr(scriptFile, "..") != 0)) {
-        error("ERROR: Non-existent or relative path script '%s'", scriptFile);
+        error("ERROR: Non-existent or relative path script '%s'", *scriptFile);
         return false;
         }
      scriptParameter = Parameter;
@@ -162,5 +153,5 @@ bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int
 cString cIptvProtocolExt::GetInformation(void)
 {
   //debug("cIptvProtocolExt::GetInformation()");
-  return cString::sprintf("ext://%s:%d", scriptFile, scriptParameter);
+  return cString::sprintf("ext://%s:%d", *scriptFile, scriptParameter);
 }

protocolext.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolext.h,v 1.9 2008/01/04 23:36:37 ajhseppa Exp $
  */
 
 #ifndef __IPTV_PROTOCOLEXT_H
@@ -16,8 +15,7 @@
 class cIptvProtocolExt : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
   int pid;
-  char* listenAddr;
+  cString scriptFile;
-  char* scriptFile;
   int scriptParameter;
 
 private:
@@ -27,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);

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,10 @@
 
 cIptvProtocolFile::cIptvProtocolFile()
 : fileDelay(0),
-  readBufferLen(TS_SIZE * IptvConfig.GetReadBufferTsCount()),
   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 +29,6 @@ cIptvProtocolFile::~cIptvProtocolFile()
   cIptvProtocolFile::Close();
   // Free allocated memory
   free(fileLocation);
-  free(readBuffer);
 }
 
 bool cIptvProtocolFile::OpenFile(void)
@@ -62,10 +55,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 +74,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;
 }
 

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);

protocolhttp.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolhttp.c,v 1.22 2008/01/04 23:36:37 ajhseppa Exp $
  */
 
 #include <sys/types.h>
@@ -34,7 +33,6 @@ cIptvProtocolHttp::~cIptvProtocolHttp()
   // Free allocated memory
   free(streamPath);
   free(streamAddr);
-
 }
 
 bool cIptvProtocolHttp::Connect(void)
@@ -88,17 +86,14 @@ bool cIptvProtocolHttp::Connect(void)
         }
 
      // Formulate and send HTTP request
-     char buffer[256];
+     cString buffer = cString::sprintf("GET %s HTTP/1.1\r\n"
-     memset(buffer, '\0', sizeof(buffer));
+                                       "Host: %s\r\n"
-     snprintf(buffer, sizeof(buffer),
+                                       "User-Agent: vdr-iptv\r\n"
-	      "GET %s HTTP/1.1\r\n"
+                                       "Range: bytes=0-\r\n"
-	      "Host: %s\r\n"
+                                       "Connection: Close\r\n"
-	      "User-Agent: vdr-iptv\r\n"
+                                       "\r\n", streamPath, streamAddr);
-	      "Range: bytes=0-\r\n"
-	      "Connection: Close\r\n"
-	      "\r\n", streamPath, streamAddr);
 
-     //debug("Sending http request: %s\n", buffer);
+     debug("Sending http request: %s\n", *buffer);
      err = send(socketDesc, buffer, strlen(buffer), 0);
      ERROR_IF_FUNC(err < 0, "send()", CloseSocket(), return false);
 
@@ -119,10 +114,10 @@ bool cIptvProtocolHttp::Disconnect(void)
   debug("cIptvProtocolHttp::Disconnect()\n");
   // Check that stream address is valid
   if (isActive) {
-      // Close the socket
+     // Close the socket
-      CloseSocket();
+     CloseSocket();
-      // Update active flag
+     // Update active flag
-      isActive = false;
+     isActive = false;
      }
   return true;
 }
@@ -219,31 +214,31 @@ 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)
 {
   debug("cIptvProtocolHttp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
   if (!isempty(Location)) {
-    // Disconnect the current socket
+     // Disconnect the current socket
-    Disconnect();
+     Disconnect();
-    // Update stream address, path and port
+     // Update stream address, path and port
-    streamAddr = strcpyrealloc(streamAddr, Location);
+     streamAddr = strcpyrealloc(streamAddr, Location);
-    char *path = strstr(streamAddr, "/");
+     char *path = strstr(streamAddr, "/");
-    if (path) {
+     if (path) {
-       streamPath = strcpyrealloc(streamPath, path);
+        streamPath = strcpyrealloc(streamPath, path);
-       *path = 0;
+        *path = 0;
-       }
+        }
-    else
+     else
-       streamPath = strcpyrealloc(streamPath, "/");
+        streamPath = strcpyrealloc(streamPath, "/");
-    socketPort = Parameter;
+     socketPort = Parameter;
-    debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
+     //debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
-    // Re-connect the socket
+     // Re-connect the socket
-    Connect();
+     Connect();
-    }
+     }
   return true;
 }
 

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
@@ -28,7 +27,7 @@ private:
 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);

protocolif.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolif.h,v 1.7 2007/10/19 22:18:55 rahrenbe Exp $
  */
 
 #ifndef __IPTV_PROTOCOLIF_H
@@ -13,15 +12,15 @@ 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;
   virtual cString GetInformation(void) = 0;
 
 private:
-    cIptvProtocolIf(const cIptvProtocolIf&);
+  cIptvProtocolIf(const cIptvProtocolIf&);
-    cIptvProtocolIf& operator=(const cIptvProtocolIf&);
+  cIptvProtocolIf& operator=(const cIptvProtocolIf&);
 };
 
 #endif // __IPTV_PROTOCOLIF_H

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)

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);

sectionfilter.c

@@ -3,16 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sectionfilter.c,v 1.17 2008/01/19 21:08:02 ajhseppa Exp $
  */
 
 #include "sectionfilter.h"
-#include "statistics.h"
 
-#define IPTV_FILTER_FILENAME "/tmp/vdr-iptv%d.filter%d"
+cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
-
+                                       u_short Pid, u_char Tid, u_char Mask)
-cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
-				       u_short Pid, u_char Tid, u_char Mask)
 : pusi_seen(0),
   feedcc(0),
   doneq(0),
@@ -21,42 +17,43 @@ cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
   seclen(0),
   tsfeedp(0),
   pid(Pid),
-  id(Index)
+  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));
   memset(filter_mode, '\0', sizeof(filter_mode));
   memset(maskandmode, '\0', sizeof(maskandmode));
   memset(maskandnotmode, '\0', sizeof(maskandnotmode));
-  memset(pipeName, '\0', sizeof(pipeName));
-
-  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];
+      mode = filter_mode[i];
-    mask = filter_mask[i];
+      mask = filter_mask[i];
-    maskandmode[i] = mask & mode;
+      maskandmode[i] = mask & mode;
-    local_doneq |= maskandnotmode[i] = mask & ~mode;
+      local_doneq |= maskandnotmode[i] = mask & ~mode;
-  }
+      }
   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);
+  i = mknod(pipeName, 0644 | S_IFIFO, 0);
-  ERROR_IF_RET(err < 0, "mknod()", return);
+  ERROR_IF_RET(i < 0, "mknod()", return);
 
   // Create descriptors
   fifoDescriptor = open(pipeName, O_RDWR | O_NONBLOCK);
@@ -65,130 +62,73 @@ 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);
-  memset(pipeName, '\0', sizeof(pipeName));
   fifoDescriptor = -1;
   readDescriptor = -1;
 }
 
-void cIptvSectionFilter::SetPipeName(int deviceIndex)
+int cIptvSectionFilter::GetReadDesc(void)
-{
-  snprintf(pipeName, sizeof(pipeName), IPTV_FILTER_FILENAME, deviceIndex, id);
-}
-
-int cIptvSectionFilter::GetReadDesc()
 {
   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,
+void cIptvSectionFilter::New(void)
-                                                const uint8_t *buffer2, size_t buffer2_len,
-                                                enum dmx_success success)
 {
-  // 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++) {
+  for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
       uint8_t local_xor = filter_value[i] ^ secbuf[i];
-      if (maskandmode[i] & local_xor) {
+      if (maskandmode[i] & local_xor)
-#ifdef DEBUG_PRINTF
-         printf("maskandmode discard\n");
-#endif
          return 0;
-         }
       neq |= maskandnotmode[i] & local_xor;
       }
 
-  if (doneq && !neq) {
+  if (doneq && !neq)
-#ifdef DEBUG_PRINTF
-     printf("doneq discard, doneq = 0x%X, neq = 0x%X\n", doneq, !neq);
-#endif
      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) {
+  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
      len = DMX_MAX_SECFEED_SIZE - tsfeedp;
-     }
 
   if (len <= 0)
      return 0;
@@ -196,108 +136,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++) {
+  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();
+         Feed();
-#ifdef DEMUX_SECTION_LOSS_LOG
+      secbufp += seclen_local;
-      else
+      secbuf += seclen_local;
-         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 */
       }
   return 0;
 }
 
-void cIptvSectionFilter::ProcessData(const uint8_t* buf)
+void cIptvSectionFilter::Process(const uint8_t* Data)
 {
-  if (buf[0] != 0x47) {
+  if (Data[0] != TS_SYNC_BYTE)
-     error("Not TS packet: 0x%X\n", buf[0]);
      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;
 
   int dc_i = 0;
-  if (buf[3] & 0x20) {
+  if (Data[3] & 0x20) {
-     /* adaption field present, check for discontinuity_indicator */
+     // Adaption field present, check for discontinuity_indicator
-     if ((buf[4] > 0) && (buf[5] & 0x80))
+     if ((Data[4] > 0) && (Data[5] & 0x80))
         dc_i = 1;
      }
 
   if (!ccok || dc_i) {
-#ifdef DEMUX_SECTION_LOSS_LOG
+     // Discontinuity detected. Reset pusi_seen = 0 to
-     printf("sectionfilter.c discontinuity detected %d bytes lost\n",
+     // stop feeding of suspicious data until next PUSI=1 arrives
-            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
-      */
      pusi_seen = 0;
-     demux_swfilter_section_new();
+     New();
      }
 
-  if (buf[1] & 0x40) {
+  if (Data[1] & 0x40) {
-     /* PUSI=1 (is set), section boundary is here */
+     // PUSI=1 (is set), section boundary is here
-     if (count > 1 && buf[p] < count) {
+     if (count > 1 && Data[p] < count) {
-#ifdef DEBUG_PRINTF
+        const uint8_t *before = &Data[p + 1];
-        printf("Valid section\n");
+        uint8_t before_len = Data[p];
-#endif
-        const uint8_t *before = &buf[p + 1];
-        uint8_t before_len = buf[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();
+        New();
-        demux_swfilter_section_copy_dump(after, after_len);
+        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 */
+     // PUSI=0 (is not set), no section boundary
-     demux_swfilter_section_copy_dump(&buf[p], count);
+     CopyDump(&Data[p], count);
      }
 }

sectionfilter.h

@@ -3,24 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sectionfilter.h,v 1.7 2007/10/08 23:51:58 rahrenbe Exp $
  */
 
 #ifndef __IPTV_SECTIONFILTER_H
 #define __IPTV_SECTIONFILTER_H
 
-#include <stdio.h>
+#include <vdr/device.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 "common.h"
 #include "statistics.h"
@@ -28,19 +16,19 @@
 class cIptvSectionFilter : public cIptvSectionStatistics {
 private:
   enum dmx_success {
-    DMX_OK = 0, /* Received Ok */
+    DMX_OK = 0,         // Received OK
-    DMX_LENGTH_ERROR, /* Incorrect length */
+    DMX_LENGTH_ERROR,   // Incorrect length
-    DMX_OVERRUN_ERROR, /* Receiver ring buffer overrun */
+    DMX_OVERRUN_ERROR,  // Receiver ring buffer overrun
-    DMX_CRC_ERROR, /* Incorrect CRC */
+    DMX_CRC_ERROR,      // Incorrect CRC
-    DMX_FRAME_ERROR, /* Frame alignment error */
+    DMX_FRAME_ERROR,    // Frame alignment error
-    DMX_FIFO_ERROR, /* Receiver FIFO overrun */
+    DMX_FIFO_ERROR,     // Receiver FIFO overrun
-    DMX_MISSED_ERROR /* Receiver missed packet */
+    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,7 +44,10 @@ 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];
@@ -65,40 +56,20 @@ private:
   uint8_t maskandmode[DMX_MAX_FILTER_SIZE];
   uint8_t maskandnotmode[DMX_MAX_FILTER_SIZE];
 
-  char pipeName[128];
+  inline uint16_t GetLength(const uint8_t *Data);
-
+  void New(void);
-  inline uint16_t section_length(const uint8_t *buf);
+  int Filter(void);
-
+  inline int Feed(void);
-  int dmxdev_section_callback(const uint8_t *buffer1,
+  int CopyDump(const uint8_t *buf, uint8_t len);
-                              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);
 
 public:
   // constructor & destructor
-  cIptvSectionFilter(int Index, int devInd, u_short Pid, u_char Tid,
+  cIptvSectionFilter(int Index, int DeviceIndex, u_short Pid,
-                     u_char Mask);
+                     u_char Tid, u_char Mask);
-
   virtual ~cIptvSectionFilter();
-
+  void Process(const uint8_t* Data);
-  void ProcessData(const uint8_t* buf);
+  int GetReadDesc(void);
-
+  uint16_t GetPid(void) { return pid; }
-  int GetReadDesc();
-  uint16_t GetPid() { return pid; }
 };
 
 #endif // __IPTV_SECTIONFILTER_H

setup.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c,v 1.50 2008/01/20 16:15:14 rahrenbe Exp $
  */
 
 #include <string.h>
@@ -35,14 +34,15 @@ 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];
   } data;
   cChannel *channel;
   const char *protocols[eProtocolCount];
   void Setup(void);
-  cString GetIptvSettings(const char *Param, int *Parameter, int *Protocol);
+  cString GetIptvSettings(const char *Param, int *Parameter, int *SidScan, int *PidScan, int *Protocol);
   void GetChannelData(cChannel *Channel);
   void SetChannelData(cChannel *Channel);
 
@@ -57,7 +57,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) {
@@ -69,12 +69,33 @@ cIptvMenuEditChannel::cIptvMenuEditChannel(cChannel *Channel, bool New)
   Setup();
 }
 
-cString cIptvMenuEditChannel::GetIptvSettings(const char *Param, int *Parameter, int *Protocol)
+cString cIptvMenuEditChannel::GetIptvSettings(const char *Param, int *Parameter, int *SidScan, int *PidScan, int *Protocol)
 {
   char *tag = NULL;
   char *proto = NULL;
   char *loc = NULL;
-  if (sscanf(Param, "%a[^|]|%a[^|]|%a[^|]|%d", &tag, &proto, &loc, Parameter) == 4) {
+  if (sscanf(Param, "%a[^|]|S%dP%d|%a[^|]|%a[^|]|%d", &tag, SidScan, PidScan, &proto, &loc, Parameter) == 6) {
+     cString tagstr(tag, true);
+     cString protostr(proto, true);
+     cString locstr(loc, true);
+     // 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;
+        }
+     }
+  else if (sscanf(Param, "%a[^|]|P%dS%d|%a[^|]|%a[^|]|%d", &tag, PidScan, SidScan, &proto, &loc, Parameter) == 6) {
      cString tagstr(tag, true);
      cString protostr(proto, true);
      cString locstr(loc, true);
@@ -101,11 +122,14 @@ cString cIptvMenuEditChannel::GetIptvSettings(const char *Param, int *Parameter,
 void cIptvMenuEditChannel::GetChannelData(cChannel *Channel)
 {
   if (Channel) {
-     int parameter, protocol;
+     int parameter, protocol, sidscan, pidscan;
      data.frequency = Channel->Frequency();
      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);
@@ -120,7 +144,9 @@ void cIptvMenuEditChannel::GetChannelData(cChannel *Channel)
      data.tid = Channel->Tid();
      data.rid = Channel->Rid();
      strn0cpy(data.name, Channel->Name(), sizeof(data.name));
-     strn0cpy(data.location, *GetIptvSettings(Channel->PluginParam(), &parameter, &protocol), sizeof(data.location));
+     strn0cpy(data.location, *GetIptvSettings(Channel->PluginParam(), &parameter, &sidscan, &pidscan, &protocol), sizeof(data.location));
+     data.sidscan = sidscan;
+     data.pidscan = pidscan;
      data.protocol = protocol;
      data.parameter = parameter;
      }
@@ -129,6 +155,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;
@@ -144,6 +171,8 @@ void cIptvMenuEditChannel::GetChannelData(cChannel *Channel)
      data.rid = 0;
      strn0cpy(data.name, "IPTV", sizeof(data.name));
      strn0cpy(data.location, "127.0.0.1", sizeof(data.location));
+     data.sidscan = 0;
+     data.pidscan = 0;
      data.protocol = eProtocolUDP;
      data.parameter = 1234;
      }
@@ -157,23 +186,23 @@ void cIptvMenuEditChannel::SetChannelData(cChannel *Channel)
      char dlangs[MAXDPIDS][MAXLANGCODE2] = { "" };
      switch (data.protocol) {
        case eProtocolEXT:
-            param = cString::sprintf("IPTV|EXT|%s|%d", data.location, data.parameter);
+            param = cString::sprintf("IPTV|S%dP%d|EXT|%s|%d", data.sidscan, data.pidscan, data.location, data.parameter);
             break;
        case eProtocolFILE:
-            param = cString::sprintf("IPTV|FILE|%s|%d", data.location, data.parameter);
+            param = cString::sprintf("IPTV|S%dP%d|FILE|%s|%d", data.sidscan, data.pidscan, data.location, data.parameter);
             break;
        case eProtocolHTTP:
-            param = cString::sprintf("IPTV|HTTP|%s|%d", data.location, data.parameter);
+            param = cString::sprintf("IPTV|S%dP%d|HTTP|%s|%d", data.sidscan, data.pidscan, data.location, data.parameter);
             break;
        default:
        case eProtocolUDP:
-            param = cString::sprintf("IPTV|UDP|%s|%d", data.location, data.parameter);
+            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);
@@ -192,49 +221,39 @@ 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;
     }
+  cOsdItem *sidScanItem = new cMenuEditBoolItem(tr("Scan Sid"), &data.sidscan);
+  if (!IptvConfig.GetSectionFiltering())
+     sidScanItem->SetSelectable(false);
+  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));
@@ -257,44 +276,44 @@ eOSState cIptvMenuEditChannel::ProcessKey(eKeys Key)
         bool firstIncrement = true;
         // Search for identical channels as these will be ignored by vdr
         for (cChannel *iteratorChannel = Channels.First(); iteratorChannel;
-             iteratorChannel = Channels.Next(iteratorChannel)) {
+            iteratorChannel = Channels.Next(iteratorChannel)) {
-           // This is one of the channels cause the uniquity check to fail
+            // This is one of the channels cause the uniquity check to fail
-           if (!iteratorChannel->GroupSep() && iteratorChannel != channel
+            if (!iteratorChannel->GroupSep() && iteratorChannel != channel &&
-               && iteratorChannel->GetChannelID() == newchannel.GetChannelID()) {
+                iteratorChannel->GetChannelID() == newchannel.GetChannelID()) {
-              // See if it has unique Plugin param. If yes then increment
+               // See if it has unique Plugin param. If yes then increment
-              // the corresponding Rid until it is unique
+               // the corresponding Rid until it is unique
-              if (strcmp(iteratorChannel->PluginParam(),
+               if (strcmp(iteratorChannel->PluginParam(),
-                         newchannel.PluginParam())) {
+                          newchannel.PluginParam())) {
-                 // If the channel RID is already at maximum, then fail the
+                  // If the channel RID is already at maximum, then fail the
-                 // channel modification
+                  // channel modification
-                 if (iteratorChannel->Rid() >= 0x1FFF) {
+                  if (iteratorChannel->Rid() >= 0x1FFF) {
-                    debug("Cannot increment RID over maximum value\n");
+                     debug("Cannot increment RID over maximum value\n");
-                    uniquityFailed = true;
+                     uniquityFailed = true;
-                    break;
+                     break;
-                    }
+                     }
-                 debug("Incrementing conflicting channel RID\n");
+                  debug("Incrementing conflicting channel RID\n");
-                 iteratorChannel->SetId(iteratorChannel->Nid(),
+                  iteratorChannel->SetId(iteratorChannel->Nid(),
-                                        iteratorChannel->Tid(),
+                                         iteratorChannel->Tid(),
-                                        iteratorChannel->Sid(),
+                                         iteratorChannel->Sid(),
-                                        firstIncrement ?
+                                         firstIncrement ?
-                                        0 : iteratorChannel->Rid() + 1);
+                                         0 : iteratorChannel->Rid() + 1);
 
-                 // Try zero Rid:s at first increment. Prevents them from
+                  // Try zero Rid:s at first increment. Prevents them from
-                 // creeping slowly towards their maximum value
+                  // creeping slowly towards their maximum value
-                 firstIncrement = false;
+                  firstIncrement = false;
 
-                 // Re-set the search and start again
+                  // Re-set the search and start again
-                 iteratorChannel = Channels.First();
+                  iteratorChannel = Channels.First();
-                 continue;
+                  continue;
-                 // Cannot work around by incrementing rid because channels
+                  // Cannot work around by incrementing rid because channels
-                 // are actually copies of each other
+                  // are actually copies of each other
-                 }
+                  }
-              else {
+               else {
-                 uniquityFailed = true;
+                  uniquityFailed = true;
-                 break;
+                  break;
-                 }
+                  }
-              }
+               }
-           }
+            }
         if (!uniquityFailed) {
            if (channel) {
               SetChannelData(channel);
@@ -363,9 +382,7 @@ cIptvMenuChannelItem::cIptvMenuChannelItem(cChannel *Channel)
 
 void cIptvMenuChannelItem::Set(void)
 {
-  char *buffer = NULL;
+  SetText(cString::sprintf("%d\t%s", channel->Number(), channel->Name()));
-  asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
-  SetText(buffer, false);
 }
 
 // --- cIptvMenuChannels -----------------------------------------------------
@@ -566,7 +583,7 @@ void cIptvMenuInfo::Display(void)
 {
   cOsdMenu::Display();
   DisplayMenu()->SetText(text, true);
-  if (text)
+  if (*text)
      cStatus::MsgOsdTextItem(text);
 }
 
@@ -622,7 +639,6 @@ cIptvPluginSetup::cIptvPluginSetup()
   tsBufferPrefill = IptvConfig.GetTsBufferPrefillRatio();
   extProtocolBasePort = IptvConfig.GetExtProtocolBasePort();
   sectionFiltering = IptvConfig.GetSectionFiltering();
-  sidScanning = IptvConfig.GetSidScanning();
   numDisabledFilters = IptvConfig.GetDisabledFiltersCount();
   if (numDisabledFilters > SECTION_FILTER_TABLE_SIZE)
      numDisabledFilters = SECTION_FILTER_TABLE_SIZE;
@@ -639,47 +655,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 cMenuEditBoolItem(tr("Scan Sid automatically"), &sidScanning));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10513
-     help.Append(tr("Define whether the service id shall be scanned automatically.\n\nRequires the section filtering. Automatic Sid scanning helps VDR to detect changed pids of streams."));
-#endif
-
      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
          }
      }
 
@@ -713,10 +710,8 @@ 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;
        }
      }
@@ -756,14 +751,12 @@ void cIptvPluginSetup::Store(void)
   SetupStore("TsBufferPrefill", tsBufferPrefill);
   SetupStore("ExtProtocolBasePort", extProtocolBasePort);
   SetupStore("SectionFiltering", sectionFiltering);
-  SetupStore("SidScanning", sidScanning);
   StoreFilters("DisabledFilters", disabledFilterIndexes);
   // Update global config
   IptvConfig.SetTsBufferSize(tsBufferSize);
   IptvConfig.SetTsBufferPrefillRatio(tsBufferPrefill);
   IptvConfig.SetExtProtocolBasePort(extProtocolBasePort);
   IptvConfig.SetSectionFiltering(sectionFiltering);
-  IptvConfig.SetSidScanning(sidScanning);
   for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i)
       IptvConfig.SetDisabledFilters(i, disabledFilterIndexes[i]);
 }

setup.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.h,v 1.18 2008/01/20 16:15:14 rahrenbe Exp $
  */
 
 #ifndef __IPTV_SETUP_H
@@ -19,13 +18,10 @@ private:
   int tsBufferPrefill;
   int extProtocolBasePort;
   int sectionFiltering;
-  int sidScanning;
   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);

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(),
+               if (IptvChannel)
-                                  assoc.getServiceId(), IptvChannel->Rid());
+                  IptvChannel->SetId(IptvChannel->Nid(), IptvChannel->Tid(),
+                                    assoc.getServiceId(), IptvChannel->Rid());
                Channels.Unlock();
                }
             SetChannel(NULL);

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

socket.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: socket.c,v 1.6 2007/10/26 22:07:10 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)
@@ -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,
+     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0, "setsockopt()",
-                              sizeof(yes)) < 0, "setsockopt()", CloseSocket(), return false);
+                   CloseSocket(), return false);
      // Bind socket
      memset(&sockAddr, '\0', sizeof(sockAddr));
      sockAddr.sin_family = AF_INET;
@@ -71,7 +64,7 @@ bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
      if (isUdp) {
         int err = bind(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
         ERROR_IF_FUNC(err < 0, "bind()", CloseSocket(), return false);
-     }
+        }
      // Update socket port
      socketPort = Port;
      }
@@ -105,60 +98,49 @@ 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
   if (socketDesc <= 0) {
-    error("ERROR: Invalid socket in %s\n", __FUNCTION__);
+     error("ERROR: Invalid socket in %s\n", __FUNCTION__);
-    return -1;
+     return -1;
-  }
+     }
   socklen_t addrlen = sizeof(sockAddr);
-  // Set argument point to read buffer
+  int len = 0;
-  *BufferAddr = readBuffer;
+  // Read data from socket
-  // Wait 500ms for data
+  if (isActive)
-  int retval = select_single_desc(socketDesc, 500000, false);
+     len = recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
-  // Check if error
+                    (struct sockaddr *)&sockAddr, &addrlen);
-  if (retval < 0)
+  if ((len > 0) && (BufferAddr[0] == TS_SYNC_BYTE)) {
-     return retval;
+     return len;
-  // Check if data available
+     }
-  else if (retval) {
+  else if (len > 3) {
-     int len = 0;
+     // http://www.networksorcery.com/enp/rfc/rfc2250.txt
-     // Read data from socket
+     // version
-     if (isActive)
+     unsigned int v = (BufferAddr[0] >> 6) & 0x03;
-        len = recvfrom(socketDesc, readBuffer, readBufferLen, MSG_DONTWAIT,
+     // extension bit
-                       (struct sockaddr *)&sockAddr, &addrlen);
+     unsigned int x = (BufferAddr[0] >> 4) & 0x01;
-     ERROR_IF_RET(len < 0, "recvfrom()", return len);
+     // cscr count
-     if ((len > 0) && (readBuffer[0] == 0x47)) {
+     unsigned int cc = BufferAddr[0] & 0x0F;
-        // Set argument point to read buffer
+     // payload type: MPEG2 TS = 33
-        *BufferAddr = &readBuffer[0];
+     //unsigned int pt = readBuffer[1] & 0x7F;
-        return len;
+     // 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) {
+     // Check that rtp is version 2 and payload contains multiple of TS packet data
-        // http://www.networksorcery.com/enp/rfc/rfc2250.txt
+     if ((v == 2) && (((len - headerlen) % TS_SIZE) == 0) &&
-        // version
+         (BufferAddr[headerlen] == TS_SYNC_BYTE)) {
-        unsigned int v = (readBuffer[0] >> 6) & 0x03;
+        // Set argument point to payload in read buffer
-        // extension bit
+        memmove(BufferAddr, &BufferAddr[headerlen], (len - headerlen));
-        unsigned int x = (readBuffer[0] >> 4) & 0x01;
+        return (len - headerlen);
-        // 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);
-           }
         }
      }
   return 0;
@@ -181,28 +163,18 @@ 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
   if (socketDesc <= 0) {
-    error("ERROR: Invalid socket in %s\n", __FUNCTION__);
+     error("ERROR: Invalid socket in %s\n", __FUNCTION__);
-    return -1;
+     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);
      }
+  socklen_t addrlen = sizeof(sockAddr);
+  // Read data from socket
+  if (isActive)
+     return recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+                     (struct sockaddr *)&sockAddr, &addrlen);
   return 0;
 }

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);
 };
 

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>

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

streamer.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: streamer.c,v 1.29 2008/01/19 21:08:03 ajhseppa 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,31 @@ cIptvStreamer::~cIptvStreamer()
   debug("cIptvStreamer::~cIptvStreamer()\n");
   // Close the protocol
   Close();
+  // Free allocated memory
+  free(packetBuffer);
 }
 
 void cIptvStreamer::Action(void)
 {
   debug("cIptvStreamer::Action(): Entering\n");
+  // Increase priority
+  //SetPriority(-1);
   // Do the thread loop
-  while (Running()) {
+  while (packetBuffer && Running()) {
-    if (ringBuffer && mutex && protocol && ringBuffer->Free()) {
+        int length = -1;
-       unsigned char *buffer = NULL;
+        if (protocol)
-       mutex->Lock();
+           length = protocol->Read(packetBuffer, packetBufferLen);
-       int length = protocol->Read(&buffer);
+        if (length > 0) {
-       if (length >= 0) {
+           AddStreamerStatistic(length);
-          AddStreamerStatistic(length);
+           if (ringBuffer) {
-          int p = ringBuffer->Put(buffer, length);
+              int p = ringBuffer->Put(packetBuffer, length);
-          if (p != length && Running())
+              if (p != length)
-             ringBuffer->ReportOverflow(length - p);
+                 ringBuffer->ReportOverflow(length - p);
-          mutex->Unlock();
+              }
-          }
+           }
-       else {
+        else
-          mutex->Unlock();
+           sleep.Wait(10); // to avoid busy loop and reduce cpu load
-          cCondWait::SleepMs(100); // to reduce cpu load
+        }
-          }
-       }
-    else
-       cCondWait::SleepMs(100); // and avoid busy loop
-    }
   debug("cIptvStreamer::Action(): Exiting\n");
 }
 
@@ -59,9 +63,8 @@ bool cIptvStreamer::Open(void)
 {
   debug("cIptvStreamer::Open()\n");
   // Open the protocol
-  if (protocol)
+  if (protocol && !protocol->Open())
-     if(!protocol->Open())
+     return false;
-       return false;
   // Start thread
   Start();
   return true;
@@ -71,18 +74,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
+  // Close the protocol
-  // 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();
   if (protocol)
      protocol->Close();
-  if (mutex)
-     mutex->Unlock();
-
   return true;
 }
 

streamer.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: streamer.h,v 1.13 2007/10/19 22:18:55 rahrenbe Exp $
  */
 
 #ifndef __IPTV_STREAMER_H
@@ -20,13 +19,13 @@
 class cIptvStreamer : public cThread, public cIptvStreamerStatistics {
 private:
   cRingBufferLinear* ringBuffer;
-  cMutex* mutex;
+  cCondWait sleep;
-  unsigned char* readBuffer;
+  unsigned char* packetBuffer;
-  unsigned int readBufferLen;
+  unsigned int packetBufferLen;
   cIptvProtocolIf* protocol;
 
 public:
-  cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex);
+  cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen);
   virtual ~cIptvStreamer();
   virtual void Action(void);
   bool Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol);
@@ -36,4 +35,3 @@ public:
 };
 
 #endif // __IPTV_STREAMER_H
-