Updated patches.

Fixed argument corruption.

.gitignore

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

HISTORY

@@ -1,6 +1,139 @@
+==================================
 VDR Plugin 'iptv' Revision History
-----------------------------------
+==================================
 
 2007-10-14: Version 0.0.1
 
 - Initial revision.
+
+2007-10-21: Version 0.0.2
+
+- Added EXT protocol.
+- Added Spids to channel editor.
+- Fixed shutdown logic.
+- Improved error checking in protocols.
+
+2007-10-28: Version 0.0.3
+
+- Fixed shutdown crash.
+- Added some minor tweaks.
+- RTP payload now restricted to TS only.
+- Added preliminary support for vdr-1.4.7.
+
+2007-11-04: Version 0.0.4
+
+- Added German translation (Thanks to Tobias Grimm).
+- Added pluginparam patch for vdr-1.5.11.
+- Updated Makefile 'i18n' targets.
+
+2007-11-27: Version 0.0.5
+
+- Added French translation (Thanks to Bruno Roussel).
+- Added a more sophisticated example script (Thanks to Tobias Grimm).
+- Improved iptvstream.sh compatibility under non-bash shells.
+
+2008-01-20: Version 0.0.6
+
+- Fixed some lint warnings.
+- 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.
+
+2009-03-22: Version 0.2.6
+
+- Added a note about recommended frequencies into README.
+- Fixed a locking bug with section filters.
+- Fixed some lint warnings.
+
+2009-06-01: Version 0.3.0
+
+- Added iptvstream-notrap.sh script.
+- Fixed setting parameters when protocol changes
+  (Thanks to Peter Holik for reporting this one).
+- Updated example scripts to use ffmpeg's direct UDP output
+  and added a new "image.sh" script (Thanks to Peter Holik).
+
+2009-10-01: Version 0.3.1
+
+- Updated patches.
+- Added optional patches to disable EIT scanning.
+- Fixed handling of HTTP protocol headers.
+- Modified sectionfilters to use socket pair instead of
+  filesystem fifos.
+
+2010-03-05: Version 0.3.2
+
+- Updated patches.
+- Fixed argument corruption.
+
+
+================================== 
+VDR Plugin 'iptv' Revision History
+================================== 
+
+2010-03-05: Version 0.4.0
+
+- Updated for vdr-1.7.13.
+- Fixed argument corruption.
+
+2010-03-09: Version 0.4.1
+
+- Fixed channel parameter corruption.
+- Added Dutch translation (Thanks to Carel).

Makefile

@@ -1,7 +1,6 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for IPTV plugin
 #
-# $Id: Makefile,v 1.18 2007/10/14 18:45:34 rahrenbe Exp $
 
 # Debugging on/off 
 #IPTV_DEBUG = 1
@@ -19,12 +18,12 @@ PLUGIN = iptv
 
 ### The version number of this plugin (taken from the main source file):
 
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -32,6 +31,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+-include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
@@ -55,11 +58,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 sectionfilter.o sidscanner.o \
+	protocolhttp.o protocolfile.o protocolext.o sectionfilter.o \
-	statistics.o common.o
+	sidscanner.o pidscanner.o statistics.o common.o socket.o source.o
 
 ### The main target:
 
@@ -84,25 +90,25 @@ $(DEPFILE): Makefile
 PODIR     = po
 LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $^
 
-$(I18Npo): $(I18Npot)
+%.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
 
-i18n: $(I18Npot) $(I18Nmo)
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(LOCALEDIR)
+	@mkdir -p $(dir $@)
-	for i in $(I18Ndirs); do\
+	cp $< $@
-	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
+
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
+.PHONY: i18n
-	    done
+i18n: $(I18Nmsgs) $(I18Npot)
 
 ### Targets:
 
@@ -117,7 +123,7 @@ 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
 

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/
 
@@ -17,8 +17,7 @@ See the file COPYING for more information.
 
 Requirements:
 
-An IPTV patched VDR-1.5.10 (or later) setup and DVB compatible MPEG1/2
+DVB compatible MPEG1/2 or H.264 network video streams.
-network video streams.
 
 Description:
 
@@ -28,11 +27,16 @@ live viewing, recording, etc. The plugin also features full section
 filtering capabilities which allow for example EIT information to be
 extracted from the incoming stream.
 
-Currently the IPTV plugin supports both multicast UDP/RTP and unicast
+Currently the IPTV plugin has direct support for both multicast UDP/RTP
-HTTP MPEG1/2 transport streams. Also a file input method is supported,
+and unicast HTTP MPEG1/2 transport streams. Also a file input method is
-but a file delay must be selected individually to prevent VDR's transfer
+supported, but a file delay must be selected individually to prevent
-buffer over/underflow. Therefore the file input should be considered
+VDR's transfer buffer over/underflow. Therefore the file input should be
-as a testing feature only.
+considered as a testing feature only.
+
+IPTV plugin also features a support for external streaming applications.
+With proper helper applications and configuration IPTV plugin is able to
+display not only MPEG1/2 transport streams but also other formats like
+MP3 radio streams, mms video streams and so on.
 
 Installation:
 
@@ -40,8 +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
-patch -p1 < PLUGINS/src/iptv/patches/vdr-X.Y.Z-pluginparam.patch
+cp -R PLUGINS/src/iptv/iptv /path/to/vdrconf/plugins/
-cp sources.conf /path/to/vdrconf/
 make
 make plugins
 ./vdr -P iptv
@@ -54,14 +57,14 @@ Setup menu:
 - TS buffer prefill ratio [%] = 0  Defines prefill ratio for transport
                                    stream ringbuffer before data is
                                    transferred to VDR.
-                                   The valid range: 0...40
+                                   Valid range: 0...40
+- EXT protocol base port = 4321    Defines base port used in EXT protocol.
+                                   The port range is defined by the number
+                                   of IPTV devices (max. 8).
+                                   Valid range: 0...65527
 - 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
@@ -72,18 +75,8 @@ Setup menu:
                                    options which allow you to disable the
                                    individual section filters.
                                    Valid range: 0...7
-- [Red:Channels]                   Opens IPTV channel editor.
 - [Blue:Info]                      Opens IPTV information/statistics menu.
 
-Channel editor menu:
-
-- Because of the different nature and content the VDR channel editor is not
-  best suited for editing of IPTV channels. Therefore an alternative editor
-  is provided which allows more IPTV centric editing of channel information.
-  An IPTV channel editor is accessible via "Setup -> Plugins -> IPTV" and
-  pressing the Red button. The channel editor is functionally similar to
-  VDR's built-in channel editor.
-
 Information menu:
 
 - [Red:General]                    Opens the general information page.
@@ -95,15 +88,20 @@ Configuration:
 
 - channels.conf
 
-  TV3;IPTV:3:IPTV|FILE|/media/video.ts|5:P:0:514:670:2321:0:3:0:0:0
+  TV4;IPTV:40:S=1|P=0|F=EXT|U=iptvstream.sh|A=0:I:0:0:680:0:0:4: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
+  TV3;IPTV:30:S=0|P=1|F=FILE|U=/video/stream.ts|A=5:I:0:514:670:2321:0:3:0:0:0
-  TV1;IPTV:1:IPTV|UDP|127.0.0.1|1234:P:0:512:650:2321:0:1:0:0:0
+  TV2;IPTV:20:S=0|P=1|F=HTTP|U=127.0.0.1/TS/2|A=3000:I:0:513:660:2321:0:2:0:0:0
-           ^ ^    ^   ^         ^    ^
+  TV1;IPTV:10:S=1|P=0|F=UDP|U=127.0.0.1|A=1234:I:0:512:650:2321:0:1:0:0:0
-           | |    |   |         |    Source type ("P")
+           ^  ^   ^   ^     ^           ^    ^
-           | |    |   |         IP Port Number or File delay (ms)
+           |  |   |   |     |           |    Source type ("I")
-           | |    |   IP Address or File Location
+           |  |   |   |     |           Stream parameter (multicast port
-           | |    Protocol ("UDP", "HTTP", "FILE")
+           |  |   |   |     |           number, HTTP port number, file delay
-           | Plugin ID ("IPTV")
+           |  |   |   |     |           (ms), script parameter)
+           |  |   |   |     Stream address (multicast address, URL, file
+           |  |   |   |     location, script location)
+           |  |   |   Stream protocol ("UDP", "HTTP", "FILE", "EXT")
+           |  |   PID Scan ("0" disable, "1" enable)
+           |  SID Scan ("0" disable, "1" enable)
            Unique enumeration
 
 - UDP multicast rules for iptables firewall
@@ -114,6 +112,27 @@ Configuration:
   # IGMP required by multicasts
   iptables -A INPUT -i eth0 -p igmp -d 224.0.0.0/4 -j ACCEPT
 
+External streaming:
+
+- To watch an externally received channel add an EXT entry to channels.conf
+  and specify a script name and parameter. The specified script is executed
+  from plugin configuration directory when VDR tunes to the channel. The
+  specified script parameter is passed to the script and it can be used to
+  select for example between different URLs.
+
+- When an EXT channel is opened the IPTV plugin opens an UDP listening port
+  on the localhost. The external script is responsible for supplying IPTV
+  plugin with MPEG2 TS data in UDP/RTP format to the listening port. The
+  data will be processed in VDR like a normal DVB broadcast. The listening
+  base port can be specified in the plugin configuration menu.
+
+- Each IPTV device has different listen port. The port number is specified
+  as a base port number plus IPTV device index minus one. Maximum of 8 IPTV
+  devices can be used simultaneously.
+
+- IPTV plugin includes an example script which uses VLC media player for
+  receiving streams, transcoding and handing the result to IPTV plugin.
+
 Notes:
 
 - Working EIT requires correct Nid/Tid/Sid values as the NIT filter cannot
@@ -123,6 +142,20 @@ 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.
+
+- Multiple channels with identical service id should have frequency
+  difference of 4 or greater. It's recommended to use frequencies in decades
+  (10, 20, 30, 40, ...) for all IPTV channel entries.
+
+- VLC processes won't get killed on some setups with the provided iptvstream.sh
+  script and the iptvstream-notrap.sh script should be used instead in these
+  cases.
+
 Acknowledgements:
 
 - The IPTV section filtering code is derived from Linux kernel.
+
+- The pid scanning code is derived from Udo Richter's streamplayer plugin.

common.c

@@ -3,16 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: common.c,v 1.3 2007/10/10 19:41:10 rahrenbe Exp $
  */
 
-#include <vdr/i18n.h>
 #include <vdr/tools.h>
 #include "common.h"
 
 uint16_t ts_pid(const uint8_t *buf)
 {
-  return ((buf[1] & 0x1f) << 8) + buf[2];
+  return (uint16_t)(((buf[1] & 0x1f) << 8) + buf[2]);
 }
 
 uint8_t payload(const uint8_t *tsp)
@@ -24,7 +22,7 @@ uint8_t payload(const uint8_t *tsp)
      if (tsp[4] > 183) // corrupted data?
         return 0;
      else
-        return 184 - 1 - tsp[4];
+        return (uint8_t)((184 - 1) - tsp[4]);
      }
 
   return 184;
@@ -39,6 +37,26 @@ const char *id_pid(const u_short Pid)
   return "---";
 }
 
+int select_single_desc(int descriptor, const int usecs, const bool selectWrite)
+{
+  // Wait for data
+  struct timeval tv;
+  tv.tv_sec = 0;
+  tv.tv_usec = usecs;
+  // Use select
+  fd_set fds;
+  FD_ZERO(&fds);
+  FD_SET(descriptor, &fds);
+  int retval = 0;
+  if (selectWrite)
+     retval = select(descriptor + 1, NULL, &fds, NULL, &tv);
+  else
+     retval = select(descriptor + 1, &fds, NULL, NULL, &tv);
+  // Check if error
+  ERROR_IF_RET(retval < 0, "select()", return retval);
+  return retval;
+}
+
 const section_filter_table_type section_filter_table[SECTION_FILTER_TABLE_SIZE] =
 {
   /* description              tag    pid   tid   mask */

common.h

@@ -3,22 +3,29 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: common.h,v 1.9 2007/10/10 19:41:10 rahrenbe Exp $
  */
 
 #ifndef __IPTV_COMMON_H
 #define __IPTV_COMMON_H
 
 #include <vdr/tools.h>
+#include <vdr/config.h>
+#include <vdr/i18n.h>
 
 #ifdef DEBUG
 #define debug(x...) dsyslog("IPTV: " x);
-#define error(x...) esyslog("IPTV: " x);
+#define error(x...) esyslog("ERROR: " x);
 #else
 #define debug(x...) ;
-#define error(x...) esyslog("IPTV: " x);
+#define error(x...) esyslog("ERROR: " x);
 #endif
 
+#define ELEMENTS(x)                     (sizeof(x) / sizeof(x[0]))
+
+#define IPTV_DVR_FILENAME               "/tmp/vdr-iptv%d.dvr"
+
+#define IPTV_SOURCE_CHARACTER           'I'
+
 #define IPTV_DEVICE_INFO_ALL            0
 #define IPTV_DEVICE_INFO_GENERAL        1
 #define IPTV_DEVICE_INFO_PIDS           2
@@ -29,9 +36,36 @@
 
 #define SECTION_FILTER_TABLE_SIZE       7
 
+#define ERROR_IF_FUNC(exp, errstr, func, ret) \
+  do {                                                            \
+     if (exp) {                                                   \
+        char tmp[64];                                             \
+        error(errstr": %s", strerror_r(errno, tmp, sizeof(tmp))); \
+        func;                                                     \
+        ret;                                                      \
+        }                                                         \
+  } while (0)
+
+
+#define ERROR_IF_RET(exp, errstr, ret) ERROR_IF_FUNC(exp, errstr, ,ret);
+
+#define ERROR_IF(exp, errstr) ERROR_IF_FUNC(exp, errstr, , );
+
+#define DELETE_POINTER(ptr)       \
+  do {                            \
+     if (ptr) {                   \
+        typeof(*ptr) *tmp = ptr;  \
+        ptr = NULL;               \
+        delete(tmp);              \
+        }                         \
+  } while (0)
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+
 uint16_t ts_pid(const uint8_t *buf);
 uint8_t payload(const uint8_t *tsp);
 const char *id_pid(const u_short Pid);
+int select_single_desc(int descriptor, const int usecs, const bool selectWrite);
 
 struct section_filter_table_type {
   const char *description;

config.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: config.c,v 1.15 2007/10/08 23:51:58 rahrenbe Exp $
  */
 
 #include "config.h"
@@ -11,32 +10,38 @@
 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 < sizeof(disabledFilters); ++i)
+  for (unsigned int i = 0; i < ARRAY_SIZE(disabledFilters); ++i)
       disabledFilters[i] = -1;
+  memset(configDirectory, '\0', sizeof(configDirectory));
 }
 
-unsigned int cIptvConfig::GetDisabledFiltersCount(void)
+unsigned int cIptvConfig::GetDisabledFiltersCount(void) const
 {
   unsigned int n = 0;
-  while ((disabledFilters[n] != -1) && (n < sizeof(disabledFilters)))
+  while ((n < ARRAY_SIZE(disabledFilters) && (disabledFilters[n] != -1)))
-    n++;
+        n++;
   return n;
 }
 
-int cIptvConfig::GetDisabledFilters(unsigned int Index)
+int cIptvConfig::GetDisabledFilters(unsigned int Index) const
 {
-  return (Index < sizeof(disabledFilters)) ? disabledFilters[Index] : -1;
+  return (Index < ARRAY_SIZE(disabledFilters)) ? disabledFilters[Index] : -1;
 }
 
 void cIptvConfig::SetDisabledFilters(unsigned int Index, int Number)
 {
-  if (Index < sizeof(disabledFilters))
+  if (Index < ARRAY_SIZE(disabledFilters))
      disabledFilters[Index] = Number;
 }
+
+void cIptvConfig::SetConfigDirectory(const char *directoryP)
+{
+  debug("cIptvConfig::SetConfigDirectory(%s)", directoryP);
+  strn0cpy(configDirectory, directoryP, sizeof(configDirectory));
+}

config.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: config.h,v 1.13 2007/10/08 23:51:58 rahrenbe Exp $
  */
 
 #ifndef __IPTV_CONFIG_H
@@ -11,35 +10,35 @@
 
 #include <vdr/menuitems.h>
 #include "common.h"
-#include "config.h"
 
 class cIptvConfig
 {
-protected:
+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) { return readBufferTsCount; }
+  unsigned int GetTsBufferSize(void) const { return tsBufferSize; }
-  unsigned int GetTsBufferSize(void) { return tsBufferSize; }
+  unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatio; }
-  unsigned int GetTsBufferPrefillRatio(void) { return tsBufferPrefillRatio; }
+  unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePort; }
-  unsigned int GetUseBytes(void) { return useBytes; }
+  unsigned int GetUseBytes(void) const { return useBytes; }
-  unsigned int GetSectionFiltering(void) { return sectionFiltering; }
+  unsigned int GetSectionFiltering(void) const { return sectionFiltering; }
-  unsigned int GetSidScanning(void) { return sidScanning; }
+  const char *GetConfigDirectory(void) const { return configDirectory; }
-  unsigned int GetDisabledFiltersCount(void);
+  unsigned int GetDisabledFiltersCount(void) const;
-  int GetDisabledFilters(unsigned int Index);
+  int GetDisabledFilters(unsigned int Index) const;
   void SetTsBufferSize(unsigned int Size) { tsBufferSize = Size; }
   void SetTsBufferPrefillRatio(unsigned int Ratio) { tsBufferPrefillRatio = Ratio; }
+  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);
 };
 
 extern cIptvConfig IptvConfig;

device.c

@@ -3,65 +3,90 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: device.c,v 1.68 2007/10/14 18:45:34 rahrenbe Exp $
  */
 
 #include "config.h"
+#include "source.h"
 #include "device.h"
 
-#define IPTV_MAX_DEVICES 8
+#define IPTV_MAX_DEVICES MAXDEVICES
 
-cIptvDevice * IptvDevices[IPTV_MAX_DEVICES] = { NULL };
+static cIptvDevice * IptvDevices[IPTV_MAX_DEVICES] = { NULL };
 
 unsigned int cIptvDevice::deviceCount = 0;
 
 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 = (unsigned int)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();
-  pIptvStreamer = new cIptvStreamer(tsBuffer, &mutex);
+  pExtProtocol = new cIptvProtocolExt();
+  pIptvStreamer = new cIptvStreamer(tsBuffer, (100 * TS_SIZE));
+  pPidScanner = new cPidScanner;
   // Initialize filter pointers
-  memset(&secfilters, '\0', sizeof(secfilters));
+  memset(secfilters, '\0', sizeof(secfilters));
   // Start section handler for iptv device
   StartSectionHandler();
   // Sid scanner must be created after the section handler
   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);
-  DELETENULL(pIptvStreamer);
+  // Stop section handler of iptv device
-  DELETENULL(pUdpProtocol);
+  StopSectionHandler();
-  DELETENULL(pHttpProtocol);
+  DELETE_POINTER(pIptvStreamer);
-  DELETENULL(pFileProtocol);
+  DELETE_POINTER(pUdpProtocol);
-  DELETENULL(tsBuffer);
+  DELETE_POINTER(pHttpProtocol);
+  DELETE_POINTER(pFileProtocol);
+  DELETE_POINTER(pExtProtocol);
+  DELETE_POINTER(tsBuffer);
+  DELETE_POINTER(pPidScanner);
   // Detach and destroy sid filter
   if (pSidScanner) {
      Detach(pSidScanner);
-     DELETENULL(pSidScanner);
+     DELETE_POINTER(pSidScanner);
      }
   // 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)
 {
   debug("cIptvDevice::Initialize(): DeviceCount=%d\n", DeviceCount);
+  new cIptvSourceParam(IPTV_SOURCE_CHARACTER, "IPTV");
   if (DeviceCount > IPTV_MAX_DEVICES)
      DeviceCount = IPTV_MAX_DEVICES;
   for (unsigned int i = 0; i < DeviceCount; ++i)
@@ -100,15 +125,15 @@ cString cIptvDevice::GetGeneralInformation(void)
   return cString::sprintf("IPTV device: %d\nCardIndex: %d\n%s%s%sChannel: %s",
                           deviceIndex, CardIndex(),
                           pIptvStreamer ? *pIptvStreamer->GetInformation() : "",
-                          pIptvStreamer ? *pIptvStreamer->GetStatistic() : "",
+                          pIptvStreamer ? *pIptvStreamer->GetStreamerStatistic() : "",
-			  *cIptvBufferStatistics::GetStatistic(),
+                          *GetBufferStatistic(),
                           *Channels.GetByNumber(cDevice::CurrentChannel())->ToText());
 }
 
 cString cIptvDevice::GetPidsInformation(void)
 {
   //debug("cIptvDevice::GetPidsInformation(%d)\n", deviceIndex);
-  return cIptvPidStatistics::GetStatistic();
+  return GetPidStatistic();
 }
 
 cString cIptvDevice::GetFiltersInformation(void)
@@ -120,7 +145,7 @@ cString cIptvDevice::GetFiltersInformation(void)
   for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
       if (secfilters[i]) {
          info = cString::sprintf("%sFilter %d: %s Pid=0x%02X (%s)\n", *info, i,
-                                 *secfilters[i]->GetStatistic(), secfilters[i]->GetPid(),
+                                 *secfilters[i]->GetSectionStatistic(), secfilters[i]->GetPid(),
                                  id_pid(secfilters[i]->GetPid()));
          if (++count > IPTV_STATS_ACTIVE_FILTERS_COUNT)
             break;
@@ -153,44 +178,16 @@ cString cIptvDevice::GetInformation(unsigned int Page)
   return info;
 }
 
-cString cIptvDevice::GetChannelSettings(const char *Param, int *IpPort, cIptvProtocolIf* *Protocol)
-{
-  debug("cIptvDevice::GetChannelSettings(%d)\n", deviceIndex);
-  char *loc = NULL;
-  if (sscanf(Param, "IPTV|UDP|%a[^|]|%u", &loc, IpPort) == 2) {
-     cString addr(loc, true);
-     *Protocol = pUdpProtocol;
-     return addr;
-     }
-  else if (sscanf(Param, "IPTV|HTTP|%a[^|]|%u", &loc, IpPort) == 2) {
-     cString addr(loc, true);
-     *Protocol = pHttpProtocol;
-     return addr;
-     }
-  else if (sscanf(Param, "IPTV|FILE|%a[^|]|%u", &loc, IpPort) == 2) {
-     cString addr(loc, true);
-     *Protocol = pFileProtocol;
-     return addr;
-     }
-  return NULL;
-}
-
-bool cIptvDevice::ProvidesIptv(const char *Param) const
-{
-  debug("cIptvDevice::ProvidesIptv(%d)\n", deviceIndex);
-  return (strncmp(Param, "IPTV", 4) == 0);
-}
-
 bool cIptvDevice::ProvidesSource(int Source) const
 {
   debug("cIptvDevice::ProvidesSource(%d)\n", deviceIndex);
-  return (cSource::IsPlug(Source));
+  return ((Source & cSource::st_Mask) == (IPTV_SOURCE_CHARACTER << 24));
 }
 
 bool cIptvDevice::ProvidesTransponder(const cChannel *Channel) const
 {
   debug("cIptvDevice::ProvidesTransponder(%d)\n", deviceIndex);
-  return (ProvidesSource(Channel->Source()) && ProvidesIptv(Channel->PluginParam()));
+  return (ProvidesSource(Channel->Source()));
 }
 
 bool cIptvDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
@@ -206,21 +203,48 @@ 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 port;
-  cString addr;
   cIptvProtocolIf *protocol;
+  cIptvTransponderParameters itp(Channel->Parameters());
 
   debug("cIptvDevice::SetChannelDevice(%d)\n", deviceIndex);
-  addr = GetChannelSettings(Channel->PluginParam(), &port, &protocol);
+  
-  if (isempty(addr)) {
+  if (isempty(itp.Address())) {
-     error("ERROR: Unrecognized IPTV channel settings: %s", Channel->PluginParam());
+     error("Unrecognized IPTV address: %s", Channel->Parameters());
      return false;
      }
-  pIptvStreamer->Set(addr, port, protocol);
+  switch (itp.Protocol()) {
-  if (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
+    case cIptvTransponderParameters::eProtocolUDP:
-     pSidScanner->SetChannel(Channel);
+         protocol = pUdpProtocol;
+         break;
+    case cIptvTransponderParameters::eProtocolHTTP:
+         protocol = pHttpProtocol;
+         break;
+    case cIptvTransponderParameters::eProtocolFILE:
+         protocol = pFileProtocol;
+         break;
+    case cIptvTransponderParameters::eProtocolEXT:
+         protocol = pExtProtocol;
+         break;
+    default:
+         error("Unrecognized IPTV protocol: %s", Channel->Parameters());
+         return false;
+         break;
+  }
+  sidScanEnabled = itp.SidScan() ? true : false;
+  pidScanEnabled = itp.PidScan() ? true : false;
+  if (pIptvStreamer->Set(itp.Address(), itp.Parameter(), deviceIndex, protocol)) {
+     if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+        pSidScanner->SetChannel(Channel);
+     if (pidScanEnabled && pPidScanner)
+        pPidScanner->SetChannel(Channel);
+     }
   return true;
 }
 
@@ -242,7 +266,7 @@ bool cIptvDevice::DeleteFilter(unsigned int Index)
   return false;
 }
 
-bool cIptvDevice::IsBlackListed(u_short Pid, u_char Tid, u_char Mask)
+bool cIptvDevice::IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const
 {
   //debug("cIptvDevice::IsBlackListed(%d) Pid=%d Tid=%02X Mask=%02X\n", deviceIndex, Pid, Tid, Mask);
   // loop through section filter table
@@ -267,11 +291,13 @@ int cIptvDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
   // Blacklist check, refuse certain filters
   if (IsBlackListed(Pid, Tid, Mask))
      return -1;
+  // Lock
+  cMutexLock MutexLock(&mutex);
   // Search the next free filter slot
   for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
       if (!secfilters[i]) {
          //debug("cIptvDevice::OpenFilter(%d): Pid=%d Tid=%02X Mask=%02X Index=%d\n", deviceIndex, Pid, Tid, Mask, i);
-         secfilters[i] = new cIptvSectionFilter(i, deviceIndex, Pid, Tid, Mask);
+         secfilters[i] = new cIptvSectionFilter(deviceIndex, i, Pid, Tid, Mask);
          return secfilters[i]->GetReadDesc();
          }
       }
@@ -281,6 +307,9 @@ int cIptvDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
 
 void cIptvDevice::CloseFilter(int Handle)
 {
+  // Lock
+  cMutexLock MutexLock(&mutex);
+  // Search the filter for deletion
   for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
       if (secfilters[i] && (Handle == secfilters[i]->GetReadDesc())) {
          //debug("cIptvDevice::CloseFilter(%d): %d\n", deviceIndex, Handle);
@@ -293,14 +322,13 @@ void cIptvDevice::CloseFilter(int Handle)
 bool cIptvDevice::OpenDvr(void)
 {
   debug("cIptvDevice::OpenDvr(%d)\n", deviceIndex);
-  mutex.Lock();
   isPacketDelivered = false;
   tsBuffer->Clear();
-  mutex.Unlock();
   ResetBuffering();
-  pIptvStreamer->Open();
+  if (pIptvStreamer)
-  if (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
+     pIptvStreamer->Open();
-     pSidScanner->SetStatus(true);
+  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+     pSidScanner->Open();
   isOpenDvr = true;
   return true;
 }
@@ -308,9 +336,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);
+     pSidScanner->Close();
-  pIptvStreamer->Close();
+  if (pIptvStreamer)
+     pIptvStreamer->Close();
   isOpenDvr = false;
 }
 
@@ -324,7 +353,7 @@ void cIptvDevice::ResetBuffering(void)
 {
   debug("cIptvDevice::ResetBuffering(%d)\n", deviceIndex);
   // pad prefill to multiple of TS_SIZE
-  tsBufferPrefill = MEGABYTE(IptvConfig.GetTsBufferSize()) *
+  tsBufferPrefill = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize()) *
                     IptvConfig.GetTsBufferPrefillRatio() / 100;
   tsBufferPrefill -= (tsBufferPrefill % TS_SIZE);
 }
@@ -343,12 +372,12 @@ 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;
         // Update buffer statistics
-        cIptvBufferStatistics::AddStatistic(TS_SIZE, tsBuffer->Available());
+        AddBufferStatistic(TS_SIZE, tsBuffer->Available());
         }
      uchar *p = tsBuffer->Get(Count);
      if (p && Count >= TS_SIZE) {
@@ -360,21 +389,31 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
                   }
                }
            tsBuffer->Del(Count);
-           error("ERROR: skipped %d bytes to sync on TS packet\n", Count);
+           error("Skipped %d bytes to sync on TS packet\n", Count);
            return false;
            }
         isPacketDelivered = true;
         Data = p;
-	// Update pid statistics 
+        // Update pid statistics
-	cIptvPidStatistics::AddStatistic(ts_pid(p), payload(p));
+        AddPidStatistic(ts_pid(p), payload(p));
+        // Send data also to dvr fifo
+        if (dvrFd >= 0)
+           Count = (int)write(dvrFd, p, TS_SIZE);
+        // Analyze incomplete streams with built-in pid analyzer
+        if (pidScanEnabled && pPidScanner)
+           pPidScanner->Process(p);
+        // Lock
+        cMutexLock MutexLock(&mutex);
         // Run the data through all filters
         for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
             if (secfilters[i])
-               secfilters[i]->ProcessData(p);
+               secfilters[i]->Process(p);
             }
         return true;
         }
      }
+  // Reduce cpu load by preventing busylooping
+  cCondWait::SleepMs(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.32 2007/10/14 18:45:34 rahrenbe Exp $
  */
 
 #ifndef __IPTV_DEVICE_H
@@ -14,8 +13,10 @@
 #include "protocoludp.h"
 #include "protocolhttp.h"
 #include "protocolfile.h"
+#include "protocolext.h"
 #include "streamer.h"
 #include "sectionfilter.h"
+#include "pidscanner.h"
 #include "sidscanner.h"
 #include "statistics.h"
 
@@ -33,14 +34,19 @@ private:
     eMaxSecFilterCount = 32
   };
   unsigned int deviceIndex;
+  int dvrFd;
   bool isPacketDelivered;
   bool isOpenDvr;
+  bool sidScanEnabled;
+  bool pidScanEnabled;
   cRingBufferLinear *tsBuffer;
   int tsBufferPrefill;
   cIptvProtocolUdp *pUdpProtocol;
   cIptvProtocolHttp *pHttpProtocol;
   cIptvProtocolFile *pFileProtocol;
+  cIptvProtocolExt *pExtProtocol;
   cIptvStreamer *pIptvStreamer;
+  cPidScanner *pPidScanner;
   cSidScanner *pSidScanner;
   cMutex mutex;
   cIptvSectionFilter* secfilters[eMaxSecFilterCount];
@@ -51,26 +57,29 @@ public:
   virtual ~cIptvDevice();
   cString GetInformation(unsigned int Page = IPTV_DEVICE_INFO_ALL);
 
-  // for statistics and general information
+  // copy and assignment constructors
 private:
+  cIptvDevice(const cIptvDevice&);
+  cIptvDevice& operator=(const cIptvDevice&);
+
+  // for statistics and general information
   cString GetGeneralInformation(void);
   cString GetPidsInformation(void);
   cString GetFiltersInformation(void);
 
   // for channel parsing & buffering
 private:
-  cString GetChannelSettings(const char *Param, int *IpPort, cIptvProtocolIf* *Protocol);
-  bool ProvidesIptv(const char *Param) const;
   void ResetBuffering(void);
   bool IsBuffering(void);
   bool DeleteFilter(unsigned int Index);
-  bool IsBlackListed(u_short Pid, u_char Tid, u_char Mask);
+  bool IsBlackListed(u_short Pid, u_char Tid, u_char Mask) const;
 
   // for channel selection
 public:
   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);
 

iptv.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: iptv.c,v 1.20 2007/10/14 18:45:34 rahrenbe Exp $
  */
 
 #include <getopt.h>
@@ -13,12 +12,12 @@
 #include "setup.h"
 #include "device.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10510
+#if defined(APIVERSNUM) && APIVERSNUM < 10713
-#error "VDR-1.5.10 API version or greater is required!"
+#error "VDR-1.7.13 API version or greater is required!"
 #endif
 
-static const char *VERSION        = "0.0.1";
+static const char VERSION[]     = "0.4.1";
-static const char *DESCRIPTION    = trNOOP("Experience the IPTV");
+static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {
 private:
@@ -66,7 +65,7 @@ const char *cPluginIptv::CommandLineHelp(void)
 {
   debug("cPluginIptv::CommandLineHelp()\n");
   // Return a string that describes all known command line options.
-  return "  -d <num>, --devices=<number> number of devices to be created (default: 1)\n";
+  return "  -d <num>, --devices=<number> number of devices to be created\n";
 }
 
 bool cPluginIptv::ProcessArgs(int argc, char *argv[])
@@ -74,20 +73,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,      no_argument,       NULL,  0  }
-     };
+    };
 
   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;
 }
 
@@ -95,6 +94,7 @@ bool cPluginIptv::Initialize(void)
 {
   debug("cPluginIptv::Initialize()\n");
   // Initialize any background activities the plugin shall perform.
+  IptvConfig.SetConfigDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
   return cIptvDevice::Initialize(deviceCount);
 }
 
@@ -158,14 +158,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;
 }
 
@@ -177,14 +177,16 @@ bool cPluginIptv::SetupParse(const char *Name, const char *Value)
      IptvConfig.SetTsBufferSize(atoi(Value));
   else if (!strcasecmp(Name, "TsBufferPrefill"))
      IptvConfig.SetTsBufferPrefillRatio(atoi(Value));
+  else if (!strcasecmp(Name, "ExtProtocolBasePort"))
+     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] = { -1 };
+     int DisabledFilters[SECTION_FILTER_TABLE_SIZE];
-     int DisabledFiltersCount = ParseFilters(Value, DisabledFilters);
+     for (unsigned int i = 0; i < ARRAY_SIZE(DisabledFilters); ++i)
-     for (int i = 0; i < DisabledFiltersCount; ++i)
+         DisabledFilters[i] = -1;
+     unsigned int DisabledFiltersCount = ParseFilters(Value, DisabledFilters);
+     for (unsigned int i = 0; i < DisabledFiltersCount; ++i)
          IptvConfig.SetDisabledFilters(i, DisabledFilters[i]);
      }
   else

iptv/image.sh

@@ -0,0 +1,84 @@
+#!/bin/sh
+
+set -e
+
+# image.sh is used by the VDR iptv plugin to transcode images from
+# a web server to provide a video stream.
+#
+# The script originates from Peter Holik
+#
+# Example channels.conf entries:
+# Energy;IPTV:50:S=0|P=0|F=EXT|U=png.sh|A=1:I:0:256:257:0:0:3:0:0:0
+# Temperature;IPTV:60:S=0|P=0|EXT|U=png.sh|A=2:I:0:256:257:0:0:3:0:0:0
+# Temperature Week;IPTV:70:S=0|P=0|EXT|U=png.sh|A=3:I:0:256:257:0:0:3:0:0:0
+# Server Temperature;IPTV:80:S=0|P=0|EXT|U=png.sh|A=4:I:0:256:257:0:0:3:0:0:0
+# Server Temperature Week;IPTV:90:S=0|P=0|EXT|U=png.sh|A=5:I:0:256:257:0:0:3:0:0:0
+# Traffic;IPTV:100:S=0|P=0|EXT|U=png.sh|A=6:I:0:256:257:0:0:3:0:0:0
+#
+# webcam.sh is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+case ${1} in
+    1)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=energy;type=electricity"
+        ;;
+    2)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=temp;type=temperature;type_instance=Outdoor"
+        ;;
+    3)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=temp;type=temperature;type_instance=Outdoor;begin=-604800"
+        ;;
+    4)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=temp;type=temperature;type_instance=Server"
+        ;;
+    5)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=temp;type=temperature;type_instance=Server;begin=-604800"
+        ;;
+    6)
+        URL="http://proxy/cgi-bin/bin/graph.cgi?hostname=proxy;plugin=interface;type=if_octets;type_instance=ppp0"
+        ;;
+    *)
+        URL=""  # Default URL - TODO get dummy picture
+        ;;
+esac
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream temporary files
+IMAGE=/tmp/image.png
+LOG=/dev/null
+
+{
+# Using wget because ffmpeg cannot handle http/1.1 "Transfer-Encoding: chunked"
+wget -q -O "${IMAGE}" "${URL}"
+
+# Build stream from audiodump with cycle image as video
+# PID 0x100/256 = Video 0x101/257 = Audio
+exec ffmpeg -v 10 \
+  -analyzeduration 0 \
+  -loop_input \
+  -i "${IMAGE}" \
+  -f mpegts -r 25 -vcodec mpeg2video -b 4000k -s 664x540 -padleft 20 -padright 20 -padtop 16 -padbottom 20 \
+  -an \
+  "udp://127.0.0.1:${PORT}?pkt_size=16356"
+} > ${LOG} 2>&1

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:S=0|P=0|F=EXT|U=internetradio.sh|A=0:P:0:0:256:0:0:2:0:0:0
+#
+# internetradio.sh is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream configuration
+URL="mms://stream"
+TITLE="internetradio"
+
+# Stream temporary files
+FIFO=/tmp/internetradio.fifo
+LOG=/dev/null
+
+{
+rm -f "${FIFO}"
+mkfifo "${FIFO}"
+
+mplayer -dumpstream "${URL}" \
+  -quiet -nolirc -noautosub -noconsolecontrols -novideo -nojoystick \
+  -dumpfile "$FIFO" &
+
+# Time to connect and fill pipe
+sleep 3 
+
+# Build audio only stream
+# PID 0x100/256 = Audio
+ffmpeg -v -1 \
+  -i "${FIFO}" \
+  -title "${TITLE}" \
+  -f mpegts -acodec mp2 -ac 2 -ab 96k -ar 48000 \
+  "udp://127.0.0.1:${PORT}?pkt_size=16356"
+
+rm -f "${FIFO}"
+} > ${LOG} 2>&1

iptv/iptvstream-notrap.sh

@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# iptvstream.sh can be used by the VDR iptv plugin to transcode external
+# sources
+#
+# (C) 2007 Rolf Ahrenberg, Antti Seppälä
+#
+# iptvstream.sh is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Default settings for stream transcoding
+VCODEC=mp2v
+VBITRATE=2400
+ACODEC=mpga
+ABITRATE=320
+
+# There is a way to specify multiple URLs in the same script. The selection is
+# then controlled by the extra parameter passed by IPTV plugin to the script
+case ${PARAMETER} in
+    1)
+        URL=""
+        WIDTH=720
+        HEIGHT=576
+        ;;
+    2)
+        URL=""
+        ;;
+    3)
+        URL=""
+        ;;
+    *)
+        URL=""  # Default URL
+        ;;
+esac
+
+if [ -z "${URL}" ]; then
+    logger "$0: error: URL not defined!"
+    exit 1
+fi
+
+# Create transcoding options
+TRANSCODE_OPTS="vcodec=${VCODEC},acodec=${ACODEC},vb=${VBITRATE},ab=${ABITRATE}"
+if [ -n "${WIDTH}" -a -n "${HEIGHT}" ] ; then
+    TRANSCODE_OPTS="${TRANSCODE_OPTS},width=${WIDTH},height=${HEIGHT}"
+fi
+
+# Create unique pids for the stream
+let VPID=${PARAMETER}+1
+let APID=${PARAMETER}+2
+let SPID=${PARAMETER}+3
+
+# Execute VLC
+exec vlc "${URL}" --sout "#transcode{${TRANSCODE_OPTS}}:standard{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}" --intf dummy

iptv/iptvstream.sh

@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# iptvstream.sh can be used by the VDR iptv plugin to transcode external
+# sources
+#
+# (C) 2007 Rolf Ahrenberg, Antti Seppälä
+#
+# iptvstream.sh is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Default settings for stream transcoding
+VCODEC=mp2v
+VBITRATE=2400
+ACODEC=mpga
+ABITRATE=320
+
+# There is a way to specify multiple URLs in the same script. The selection is
+# then controlled by the extra parameter passed by IPTV plugin to the script
+case ${PARAMETER} in
+    1)
+        URL=""
+        WIDTH=720
+        HEIGHT=576
+        ;;
+    2)
+        URL=""
+        ;;
+    3)
+        URL=""
+        ;;
+    *)
+        URL=""  # Default URL
+        ;;
+esac
+
+if [ -z "${URL}" ]; then
+    logger "$0: error: URL not defined!"
+    exit 1
+fi
+
+# Create transcoding options
+TRANSCODE_OPTS="vcodec=${VCODEC},acodec=${ACODEC},vb=${VBITRATE},ab=${ABITRATE}"
+if [ -n "${WIDTH}" -a -n "${HEIGHT}" ] ; then
+    TRANSCODE_OPTS="${TRANSCODE_OPTS},width=${WIDTH},height=${HEIGHT}"
+fi
+
+# Create unique pids for the stream
+let VPID=${PARAMETER}+1
+let APID=${PARAMETER}+2
+let SPID=${PARAMETER}+3
+
+# Capture VLC pid for further management in IPTV plugin
+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=${!}
+
+trap 'kill -INT ${PID} 2> /dev/null' INT EXIT QUIT TERM
+
+# Waiting for the given PID to terminate
+wait ${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:S=0|P=0|F=EXT|U=linein.sh|A=0:I:27500:0:256:0:0:5:5:5:0
+#
+# linein.sh is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream configuration
+TITLE="linein"
+
+# Stream temporary files
+LOG=/dev/null
+
+{
+# PID 0x100/256 = Audio
+arecord -q -D hw:0,0 -f dat | \
+ffmpeg -v -1 \
+  -f wav \
+  -i - \
+  -title "${TITLE}" \
+  -f mpegts -acodec mp2 -ac 2 -ab 128k -ar 48000 \
+  "udp://127.0.0.1:${PORT}?pkt_size=16356"
+} > ${LOG} 2>&1

iptv/vlc2iptv

@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# vlc2iptv is used by the VDR iptv plugin to transcode external sources
+#
+# (C) 2007 Rolf Ahrenberg, Antti Seppälä
+# (C) 2007 Tobias Grimm
+#
+# vlc2iptv 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.
+#
+
+#
+# <Global Settings>
+#
+
+CHANNELS_CONF=/var/lib/vdr/channels.conf
+CHANNEL_SETTINGS_DIR=/etc/vdr/plugins/iptv/vlcinput/
+VIDEO_BITRATE=2400
+AUDIO_BITRATE=320
+
+#
+# </Global Settings>
+#
+
+exit_with_error()
+{
+    logger "vlc2iptv: error: $*"
+    exit 1
+}
+
+read_arguments()
+{
+    [ $# -ne 2 ] && exit_with_error "Invalid parameter count '$#' $*"
+    PARAMETER=$1
+    PORT=$2
+}
+
+lookup_channel_and_pids()
+{
+    [ ! -e "$CHANNELS_CONF" ] && \
+      exit_with_error "channels.conf not found ($CHANNELS_CONF)"
+
+    local CHANNEL_RECORD=`grep "[:]S=[10][|]P=[10][|]F=EXT[|]U=vlc2iptv[|]A=$PARAMETER[:]I" $CHANNELS_CONF`
+    [ -z "$CHANNEL_RECORD" ] && \
+      exit_with_error "no iptv channel with parameter $PARAMETER found"
+
+    CHANNEL_NAME=`echo $CHANNEL_RECORD | awk "-F[;,:]" '{print $1}'`
+    VPID=`echo $CHANNEL_RECORD | awk -F: '{print $6}'`
+    APID=`echo $CHANNEL_RECORD | awk -F: '{print $7}'`
+    SPID=0
+}
+
+load_channel_configuration()
+{
+    local CHANNEL_SETTINGS_FILE="$CHANNEL_SETTINGS_DIR/$CHANNEL_NAME.conf"
+
+    [ ! -e $CHANNEL_SETTINGS_FILE ] && \
+      exit_with_error "No vlc input configuration for channel '$CHANNEL_NAME'"
+    . $CHANNEL_SETTINGS_FILE
+    
+    [ -z "$URL" ] && \
+      exit_with_error "No URL specified for channel '$CHANNEL_NAME'"
+}
+
+read_arguments $*
+lookup_channel_and_pids
+load_channel_configuration
+
+#
+# Start VLC 
+#
+
+if [ -n "$WIDTH" -a -n "$HEIGHT" ] ; then
+    RESIZE_OPTIONS=",width=${WIDTH},height=${HEIGHT}"
+else
+    RESIZE_OPTIONS=""
+fi
+
+vlc "${URL}" \
+  --sout "#transcode{vcodec=mp2v$RESIZE_OPTIONS,acodec=mpga,vb=${VIDEO_BITRATE},ab=${AUDIO_BITRATE}}:standard{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}" \
+  --intf dummy &
+
+PID=${!}
+
+trap 'kill -INT ${PID} 2> /dev/null' INT EXIT QUIT TERM
+
+# Waiting for the given PID to terminate
+wait ${PID}

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:S=0|P=0|F=EXT|U=webcam.sh|A=0:I:0:256:257:0:0:3:0:0:0
+#
+# webcam.sh is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream configuration
+URL="http://stream.address"
+IMAGE="image.jpg"
+TITLE="webcam"
+
+# Stream temporary files
+FIFO=/tmp/webcam.fifo
+LOG=/dev/null
+
+{
+rm -f "${FIFO}"
+mkfifo "${FIFO}"
+
+mplayer -dumpstream "${URL}" \
+  -quiet -nolirc -noautosub -noconsolecontrols -novideo -nojoystick \
+  -dumpfile "${FIFO}" &
+
+# Time to connect and fill pipe
+sleep 3 
+
+# Build stream from audiodump with cycle image as video
+# PID 0x100/256 = Video 0x101/257 = Audio
+ffmpeg -v -1 \
+  -i "${FIFO}" -r 0.5 -loop_input -i '${IMAGE}' \
+  -title "${TITLE}" \
+  -f mpegts -intra -r 24 -vcodec mpeg2video -b 500k -s 352x288 \
+  -acodec mp2 -ac 2 -ab 96k -ar 48000 \
+  "udp://127.0.0.1:${PORT}?pkt_size=16356"
+
+rm -f "${FIFO}"
+} > ${LOG} 2>&1

patches/vdr-1.5.10-pluginparam.patch

@@ -1,265 +0,0 @@
-diff -Nru vdr-1.5.10-vanilla/channels.c vdr-1.5.10-pluginparam/channels.c
---- vdr-1.5.10-vanilla/channels.c	2007-10-14 18:21:57.000000000 +0300
-+++ vdr-1.5.10-pluginparam/channels.c	2007-10-14 20:31:12.000000000 +0300
-@@ -166,6 +166,7 @@
-   shortName = strdup("");
-   provider = strdup("");
-   portalName = strdup("");
-+  pluginParam = strdup("");
-   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-   inversion    = INVERSION_AUTO;
-   bandwidth    = BANDWIDTH_AUTO;
-@@ -187,6 +188,7 @@
-   shortName = NULL;
-   provider = NULL;
-   portalName = NULL;
-+  pluginParam = NULL;
-   schedule     = NULL;
-   linkChannels = NULL;
-   refChannel   = NULL;
-@@ -215,6 +217,7 @@
-   free(shortName);
-   free(provider);
-   free(portalName);
-+  free(pluginParam);
- }
- 
- cChannel& cChannel::operator= (const cChannel &Channel)
-@@ -223,6 +226,7 @@
-   shortName = strcpyrealloc(shortName, Channel.shortName);
-   provider = strcpyrealloc(provider, Channel.provider);
-   portalName = strcpyrealloc(portalName, Channel.portalName);
-+  pluginParam = strcpyrealloc(pluginParam, Channel.pluginParam);
-   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
-   return *this;
- }
-@@ -280,9 +284,26 @@
-      transmission = Channel->transmission;
-      guard        = Channel->guard;
-      hierarchy    = Channel->hierarchy;
-+     if (IsPlug())  pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam);
-      }
- }
- 
-+bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam)
-+{
-+  if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) {
-+       if (Number()) {
-+          dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *cSource::ToString(source), frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam);
-+          modification |= CHANNELMOD_TRANSP;
-+          Channels.SetModified();
-+          }
-+       source = Source;
-+       frequency = Frequency;
-+       pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+       schedule = NULL;
-+       }
-+    return true;
-+}
-+
- bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
- {
-   // Workarounds for broadcaster stupidity:
-@@ -407,6 +428,18 @@
-      }
- }
- 
-+void cChannel::SetPluginParam(const char *PluginParam)
-+{
-+  if (!isempty(PluginParam) && strcmp(pluginParam, PluginParam) != 0) {
-+     if (Number()) {
-+        dsyslog("changing plugin parameters of channel %d from '%s' to '%s'", Number(), pluginParam, PluginParam);
-+        modification |= CHANNELMOD_TRANSP;
-+        Channels.SetModified();
-+        }
-+     pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+     }
-+}
-+
- #define STRDIFF 0x01
- #define VALDIFF 0x02
- 
-@@ -593,7 +626,7 @@
-   if (isdigit(type))
-      type = 'S';
- #define ST(s) if (strchr(s, type))
--  char buffer[64];
-+  char buffer[256];
-   char *q = buffer;
-   *q = 0;
-   ST(" S ")  q += sprintf(q, "%c", polarization);
-@@ -605,6 +638,7 @@
-   ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
-   ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
-   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
-+  ST("P  ")  snprintf(buffer, sizeof(buffer), "%s", pluginParam);
-   return buffer;
- }
- 
-@@ -626,7 +660,7 @@
- 
- bool cChannel::StringToParameters(const char *s)
- {
--  while (s && *s) {
-+  while (s && *s && !IsPlug()) {
-         switch (toupper(*s)) {
-           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
-           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
-@@ -736,7 +770,7 @@
-         dpids[0] = 0;
-         ok = false;
-         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
--           ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
-+           ok = ((source = cSource::FromString(sourcebuf)) >= 0) && StringToParameters(parambuf);
- 
-            char *p = strchr(vpidbuf, '+');
-            if (p)
-@@ -827,6 +861,7 @@
-            shortName = strcpyrealloc(shortName, p);
-            }
-         name = strcpyrealloc(name, namebuf);
-+        if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, parambuf);
- 
-         free(parambuf);
-         free(sourcebuf);
-diff -Nru vdr-1.5.10-vanilla/channels.h vdr-1.5.10-pluginparam/channels.h
---- vdr-1.5.10-vanilla/channels.h	2007-10-14 18:21:57.000000000 +0300
-+++ vdr-1.5.10-pluginparam/channels.h	2007-10-14 20:32:16.000000000 +0300
-@@ -114,6 +114,7 @@
-   char *shortName;
-   char *provider;
-   char *portalName;
-+  char *pluginParam;
-   int __BeginData__;
-   int frequency; // MHz
-   int source;
-@@ -165,6 +166,7 @@
-   int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
-   int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
-   static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
-+  const char *PluginParam(void) const { return pluginParam; }
-   int Source(void) const { return source; }
-   int Srate(void) const { return srate; }
-   int Vpid(void) const { return vpid; }
-@@ -199,6 +201,7 @@
-   int Hierarchy(void) const { return hierarchy; }
-   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
-   const cChannel *RefChannel(void) const { return refChannel; }
-+  bool IsPlug(void) const { return cSource::IsPlug(source); }
-   bool IsCable(void) const { return cSource::IsCable(source); }
-   bool IsSat(void) const { return cSource::IsSat(source); }
-   bool IsTerr(void) const { return cSource::IsTerr(source); }
-@@ -206,12 +209,14 @@
-   bool HasTimer(void) const;
-   int Modification(int Mask = CHANNELMOD_ALL);
-   void CopyTransponderData(const cChannel *Channel);
-+  bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam);
-   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
-   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
-   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
-   void SetName(const char *Name, const char *ShortName, const char *Provider);
-   void SetPortalName(const char *PortalName);
-+  void SetPluginParam(const char *PluginParam);
-   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *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.10-vanilla/menu.c vdr-1.5.10-pluginparam/menu.c
---- vdr-1.5.10-vanilla/menu.c	2007-10-14 18:21:57.000000000 +0300
-+++ vdr-1.5.10-pluginparam/menu.c	2007-10-14 20:31:12.000000000 +0300
-@@ -219,6 +219,7 @@
-   cChannel *channel;
-   cChannel data;
-   char name[256];
-+  char pluginParam[256];
-   void Setup(void);
- public:
-   cMenuEditChannel(cChannel *Channel, bool New = false);
-@@ -251,6 +252,7 @@
- 
-   // Parameters for all types of sources:
-   strn0cpy(name, data.name, sizeof(name));
-+  strn0cpy(pluginParam, data.pluginParam, sizeof(pluginParam));
-   Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name), tr(FileNameChars)));
-   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
-   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
-@@ -281,6 +283,7 @@
-   ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
-   ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
-   ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues, tr("none")));
-+  ST("P  ")  Add(new cMenuEditStrItem( tr("Parameters"),    pluginParam, sizeof(pluginParam), tr(FileNameChars)));
- 
-   SetCurrent(Get(current));
-   Display();
-@@ -295,6 +298,7 @@
-      if (Key == kOk) {
-         if (Channels.HasUniqueChannelID(&data, channel)) {
-            data.name = strcpyrealloc(data.name, name);
-+           data.pluginParam = strcpyrealloc(data.pluginParam, pluginParam);
-            if (channel) {
-               *channel = data;
-               isyslog("edited channel %d %s", channel->Number(), *data.ToText());
-diff -Nru vdr-1.5.10-vanilla/po/fi_FI.po vdr-1.5.10-pluginparam/po/fi_FI.po
---- vdr-1.5.10-vanilla/po/fi_FI.po	2007-10-14 18:21:57.000000000 +0300
-+++ vdr-1.5.10-pluginparam/po/fi_FI.po	2007-10-14 20:34:41.000000000 +0300
-@@ -998,3 +998,6 @@
- #, c-format
- msgid "VDR will shut down in %s minutes"
- msgstr "VDR sammuu %s minuutin kuluttua"
-+
-+msgid "Parameters"
-+msgstr "Parametrit"
-diff -Nru vdr-1.5.10-vanilla/sources.c vdr-1.5.10-pluginparam/sources.c
---- vdr-1.5.10-vanilla/sources.c	2007-10-14 18:21:57.000000000 +0300
-+++ vdr-1.5.10-pluginparam/sources.c	2007-10-14 20:31:12.000000000 +0300
-@@ -37,6 +37,7 @@
-   char buffer[16];
-   char *q = buffer;
-   switch (Code & st_Mask) {
-+    case stPlug:  *q++ = 'P'; break;
-     case stCable: *q++ = 'C'; break;
-     case stSat:   *q++ = 'S';
-                   {
-@@ -56,6 +57,7 @@
- {
-   int type = stNone;
-   switch (toupper(*s)) {
-+    case 'P': type = stPlug;  break;
-     case 'C': type = stCable; break;
-     case 'S': type = stSat;   break;
-     case 'T': type = stTerr;  break;
-diff -Nru vdr-1.5.10-vanilla/sources.conf vdr-1.5.10-pluginparam/sources.conf
---- vdr-1.5.10-vanilla/sources.conf	2007-10-14 18:21:57.000000000 +0300
-+++ vdr-1.5.10-pluginparam/sources.conf	2007-10-14 20:31:12.000000000 +0300
-@@ -188,3 +188,7 @@
- # Terrestrial
- 
- T       Terrestrial
-+
-+# Plugin
-+
-+P       Plugin
-diff -Nru vdr-1.5.10-vanilla/sources.h vdr-1.5.10-pluginparam/sources.h
---- vdr-1.5.10-vanilla/sources.h	2007-10-14 18:21:57.000000000 +0300
-+++ vdr-1.5.10-pluginparam/sources.h	2007-10-14 20:31:12.000000000 +0300
-@@ -16,10 +16,11 @@
- public:
-   enum eSourceType {
-     stNone  = 0x0000,
-+    stPlug  = 0x2000,
-     stCable = 0x4000,
-     stSat   = 0x8000,
-     stTerr  = 0xC000,
--    st_Mask = 0xC000,
-+    st_Mask = 0xE000,
-     st_Neg  = 0x0800,
-     st_Pos  = 0x07FF,
-     };
-@@ -35,6 +36,7 @@
-   static cString ToString(int Code);
-   static int FromString(const char *s);
-   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
-+  static bool IsPlug(int Code) { return (Code & st_Mask) == stPlug; }
-   static bool IsCable(int Code) { return (Code & st_Mask) == stCable; }
-   static bool IsSat(int Code) { return (Code & st_Mask) == stSat; }
-   static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; }

patches/vdr-1.7.13-disable_ca_updates.patch

@@ -0,0 +1,11 @@
+diff -Nru vdr-1.7.13-vanilla/pat.c vdr-1.7.13-disable_ca_updates/pat.c
+--- vdr-1.7.13-vanilla/pat.c	2010-01-01 17:40:05.000000000 +0200
++++ vdr-1.7.13-disable_ca_updates/pat.c	2010-03-09 16:33:03.000000000 +0200
+@@ -458,6 +458,7 @@
+             }
+         if (Setup.UpdateChannels >= 2) {
+            Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
++           if ((Channel->Source() & cSource::st_Mask) != ('I' << 24))
+            Channel->SetCaIds(CaDescriptors->CaIds());
+            Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
+            }

patches/vdr-1.7.13-disable_eitscan.patch

@@ -0,0 +1,12 @@
+diff -Nru vdr-1.7.13-vanilla/eitscan.c vdr-1.7.13-disable_eitscan/eitscan.c
+--- vdr-1.7.13-vanilla/eitscan.c	2010-02-07 14:12:05.000000000 +0200
++++ vdr-1.7.13-disable_eitscan/eitscan.c	2010-03-09 16:30:02.000000000 +0200
+@@ -146,7 +146,7 @@
+                if (Device) {
+                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
+                       const cChannel *Channel = ScanData->GetChannel();
+-                      if (Channel) {
++                      if (Channel && ((Channel->Source() & cSource::st_Mask) != ('I' << 24))) {
+                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                             if (Device->ProvidesTransponder(Channel)) {
+                                if (!Device->Receiving()) {

pidscanner.c

@@ -0,0 +1,157 @@
+/*
+ * 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->Parameters());
+     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);
+              int Vtype = IptvChannel->Vtype();
+              IptvChannel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+              }
+           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

@@ -0,0 +1,151 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# This file is distributed under the same license as the iptv package.
+# Tobias <vdr@e-tobi.net>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: iptv 0.4.0\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2010-03-04 18:12+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"
+"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"
+
+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 "Erlebe IPTV"
+
+msgid "IPTV Information"
+msgstr "IPTV Informationen"
+
+msgid "General"
+msgstr "Allgemein"
+
+msgid "Pids"
+msgstr "Pids"
+
+msgid "Filters"
+msgstr "Filter"
+
+msgid "Bits/bytes"
+msgstr "Bits/Bytes"
+
+msgid "IPTV information not available!"
+msgstr "IPTV Informationen nicht verfügbar!"
+
+msgid "TS buffer size [MB]"
+msgstr "TS Puffergröße [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 Puffer-Preload [%]"
+
+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 Protokoll Basisport"
+
+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 "Benutze Abschnittsfilterung"
+
+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 "Deaktiviere Filter"
+
+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 "Deaktiviere Filter"
+
+msgid "Define an ill-behaving filter to be blacklisted."
+msgstr ""
+
+msgid "Help"
+msgstr "Hilfe"
+
+msgid "UDP"
+msgstr "UDP"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "FILE"
+msgstr "DATEI"
+
+msgid "EXT"
+msgstr "EXT"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Scan sid"
+msgstr "Scanne SID"
+
+msgid "Scan pids"
+msgstr "Scanne PIDS"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Parameter"
+msgstr "Parameter"

po/fi_FI.po

@@ -1,18 +1,18 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
-# This file is distributed under the same license as the VDR package.
+# This file is distributed under the same license as the iptv package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: iptv 0.4.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-10-14 21:42+0300\n"
+"POT-Creation-Date: 2010-03-04 18:12+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)"
@@ -39,42 +39,6 @@ msgstr "TDT (0x70)"
 msgid "Experience the IPTV"
 msgstr "Koe IPTV:n ihmeellinen maailma"
 
-msgid "UDP"
-msgstr "UDP"
-
-msgid "HTTP"
-msgstr "HTTP"
-
-msgid "FILE"
-msgstr "FILE"
-
-msgid "Protocol"
-msgstr "Protokolla"
-
-msgid "Delay (ms)"
-msgstr "Viive (ms)"
-
-msgid "Address"
-msgstr "Osoite"
-
-msgid "Port"
-msgstr "Portti"
-
-msgid "Nid"
-msgstr "Verkko-ID"
-
-msgid "Tid"
-msgstr "L<>hete-ID"
-
-msgid "Rid"
-msgstr "Radio-ID"
-
-msgid "Cannot find unique channel settings!"
-msgstr "Yksil<69>llisi<73> kanava-asetuksia ei l<>ydet<65>!"
-
-msgid "IPTV Channels"
-msgstr "IPTV-kanavat"
-
 msgid "IPTV Information"
 msgstr "IPTV-tiedot"
 
@@ -96,18 +60,107 @@ msgstr "IPTV-tietoja ei saatavilla!"
 msgid "TS buffer size [MB]"
 msgstr "TS-puskurin koko [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 ""
+"Määritä rengaspuskurin koko TS-lähetteelle megatavuina.\n"
+"\n"
+"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äärittele TS-rengaspuskurin esitäyttöaste, jonka jälkeen lähetettä aletaan siirtämään eteenpäin VDR:lle.\n"
+"\n"
+"Puskurin esitäyttö parantaa suoratoistoa hitailla ja epäluotettavilla yhteyksillä."
+
+msgid "EXT protocol base port"
+msgstr "EXT-protokollan perusportti"
+
+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 ""
+"Määrittele EXT-protokollan käyttämä perusportti.\n"
+"\n"
+"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 "Scan Sid automatically"
+msgid ""
-msgstr "Etsi palvelu-ID automaattisesti"
+"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 ""
+"Määrittele suodatuksen käyttö sektioille.\n"
+"\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ähetteeseen, jossa ei ole sektioita."
 
 msgid "Disable filters"
-msgstr "Poista suodattimia k<EFBFBD>yt<EFBFBD>st<EFBFBD>"
+msgstr "Poista suodattimia käytöstä"
+
+msgid ""
+"Define number of section filters to be disabled.\n"
+"\n"
+"Certain section filters might cause some unwanted behaviour to VDR such as time being falsely synchronized. By black-listing the filters here useful section data can be left intact for VDR to process."
+msgstr ""
+"Määrittele käytöstä poistettavien suodattimien lukumäärä sektioille.\n"
+"\n"
+"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äärittele käytöstä poistettava suodatin, joka lisätään mustalle listalle."
+
+msgid "Help"
+msgstr "Opaste"
+
+msgid "UDP"
+msgstr "UDP"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "FILE"
+msgstr "FILE"
+
+msgid "EXT"
+msgstr "EXT"
+
+msgid "Nid"
+msgstr "Verkko-ID"
+
+msgid "Tid"
+msgstr "Lähete-ID"
+
+msgid "Rid"
+msgstr "Radio-ID"
+
+msgid "Scan sid"
+msgstr "Etsi palvelu-ID"
+
+msgid "Scan pids"
+msgstr "Etsi pidit"
+
+msgid "Protocol"
+msgstr "Protokolla"
+
+msgid "Address"
+msgstr "Osoite"
+
+msgid "Parameter"
+msgstr "Parametri"

po/fr_FR.po

@@ -0,0 +1,168 @@
+# French translations for iptv package.
+# 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.4.0\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2010-03-04 18:12+0200\n"
+"PO-Revision-Date: 2008-01-26 13:14+0100\n"
+"Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n"
+"Language-Team: French\n"
+"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"
+
+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 "L'expérience IPTV"
+
+msgid "IPTV Information"
+msgstr "Information sur IPTV"
+
+msgid "General"
+msgstr "Général"
+
+msgid "Pids"
+msgstr "Pids"
+
+msgid "Filters"
+msgstr "Filtres"
+
+msgid "Bits/bytes"
+msgstr "Bits/Bytes"
+
+msgid "IPTV information not available!"
+msgstr "Information sur IPTV non disponible !"
+
+msgid "TS buffer size [MB]"
+msgstr "Taille du buffer 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 ""
+"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 [%]"
+
+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 ""
+"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"
+
+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 ""
+"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"
+
+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 ""
+"Définit si la section de filtrage doit être utilisé.\n"
+"\n"
+"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"
+"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"
+
+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 ""
+"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 "Définit les mauvais comportement qui doivent être désactivé."
+
+msgid "Help"
+msgstr "Aide"
+
+msgid "UDP"
+msgstr "UDP"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "FILE"
+msgstr "FICHIER"
+
+msgid "EXT"
+msgstr "EXT"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Scan sid"
+msgstr "Scanne les SID"
+
+msgid "Scan pids"
+msgstr "Scanne les PID"
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Parameter"
+msgstr "Paramètre"

po/it_IT.po

@@ -0,0 +1,167 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# This file is distributed under the same license as the iptv package.
+# Diego Pierotto <vdr-italian@tiscali.it>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: iptv 0.4.0\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2010-03-04 18:12+0200\n"
+"PO-Revision-Date: 2008-07-13 03:28+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team: Italian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Scopri la IPTV"
+
+msgid "IPTV Information"
+msgstr "Informazione IPTV"
+
+msgid "General"
+msgstr "Generale"
+
+msgid "Pids"
+msgstr "Pids"
+
+msgid "Filters"
+msgstr "Filtri"
+
+msgid "Bits/bytes"
+msgstr "Bits/bytes"
+
+msgid "IPTV information not available!"
+msgstr "Informazione IPTV non disponibile!"
+
+msgid "TS buffer size [MB]"
+msgstr "Dimensione buffer 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 ""
+"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 "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"
+
+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 ""
+"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"
+
+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 ""
+"Definisci se la sezione filtri sarà utilizzata.\n"
+"\n"
+"La sezioni filtri significa che il plugin IPTV prova a elaborare e fornire a VDR dati secondari sul flusso attualmente attivo. VDR può successivamente usare questi dati per fornire varie funzionalità come il rilevamento del cambio Pid automatico, EPG, etc.\n"
+"Abilitare questa funzione non influisce sui flussi che non contengono dati di sezione."
+
+msgid "Disable filters"
+msgstr "Disabilita filtri"
+
+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 ""
+"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 "Definisci un filtro corrotto che sarà messo nella lista nera."
+
+msgid "Help"
+msgstr "Aiuto"
+
+msgid "UDP"
+msgstr "UDP"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "FILE"
+msgstr "FILE"
+
+msgid "EXT"
+msgstr "EXT"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Scan sid"
+msgstr "Scansione Sid"
+
+msgid "Scan pids"
+msgstr "Scansione Pids"
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid "Address"
+msgstr "Indirizzo"
+
+msgid "Parameter"
+msgstr "Parametro"

po/nl_NL.po

@@ -0,0 +1,166 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# This file is distributed under the same license as the iptv package.
+# Carel, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: iptv 0.4.0\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2010-03-05 09:42+0100\n"
+"PO-Revision-Date: 2007-10-29 21:19+0100\n"
+"Last-Translator: Carel\n"
+"Language-Team: Dutch\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"
+
+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 "TV programma's via IP"
+
+msgid "IPTV Information"
+msgstr "IPTV informatie"
+
+msgid "General"
+msgstr "Algemeen"
+
+msgid "Pids"
+msgstr "Pids"
+
+msgid "Filters"
+msgstr "Filter"
+
+msgid "Bits/bytes"
+msgstr "Bits/Bytes"
+
+msgid "IPTV information not available!"
+msgstr "IPTV informatie niet beschikbaar!"
+
+msgid "TS buffer size [MB]"
+msgstr "TS buffergrootte [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 ""
+"Stel de grootte van de ringbuffer vast voor transportstreams in megabytes.\n"
+"\n"
+"Bij lage waarden zapt VDR sneller maar kunnen leiden tot bufferoverschreidingen en dus dropouts."
+
+msgid "TS buffer prefill ratio [%]"
+msgstr "TS buffer-preload [%]"
+
+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 ""
+"Stel een 'prefil ratio' in voor de ringbuffer voor transportstreams voor de data naar VDR wordt verstuurd.\n"
+"\n"
+"Dit is aan te bevelen bij onbetrouwbare of langzame verbindingen."
+
+msgid "EXT protocol base port"
+msgstr "EXT protocol basispoort"
+
+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 ""
+"Bepaal de basispoort voor het EXT protocol.\n"
+"\n"
+"De poortrange wordt bepaald door het aantal IPTV apparaten. Deze poort luistert naar inkomende verbindingen wanneer het EXT protocol wordt gebruikt."
+
+msgid "Use section filtering"
+msgstr "Benutze Abschnittsfilterung"
+
+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 ""
+"Bepaal of er sectionfilterimg moet worden gebrukt.\n"
+"\n"
+"Bij sectiefiltering zal de IPTV plugin VDR van extra informatie over de stream voorzien. VDR kan dan bijvoorbeeld automatisch de PIDs wijzigen of de EPG tonen.Het gebruik van deze mogelijkheid heeft geen effect op streams die geen sectiedata bevatten."
+
+msgid "Disable filters"
+msgstr "Deactiveer filter"
+
+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 ""
+"Bepaal het aantal de de-activeren sectiefilters.\n"
+"\n"
+"Sommige sctiefilters kunnen ongewenste effecten veroorzaken. Door ze hier op te nemen blijft de data intact zodat VDR het kan blijven gebruiken."
+
+#. TRANSLATORS: note the singular!
+msgid "Disable filter"
+msgstr "Deactiveer filter"
+
+msgid "Define an ill-behaving filter to be blacklisted."
+msgstr "Blacklist een probleem veroorzakend filter "
+
+msgid "Help"
+msgstr "Help"
+
+msgid "UDP"
+msgstr "UDP"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "FILE"
+msgstr "BESTAND"
+
+msgid "EXT"
+msgstr "EXT"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Scan sid"
+msgstr "Scan SID"
+
+msgid "Scan pids"
+msgstr "Scan PIDS"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "Parameter"
+msgstr "Parameter"

po/ru_RU.po

@@ -0,0 +1,152 @@
+# 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.4.0\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2010-03-04 18:12+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 "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 "Справка"
+
+msgid "UDP"
+msgstr "UDP"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "FILE"
+msgstr "ФАЙЛ"
+
+msgid "EXT"
+msgstr "EXT"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Scan sid"
+msgstr "Сканировать SID"
+
+msgid "Scan pids"
+msgstr "Сканировать пиды"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Parameter"
+msgstr "Параметр"

protocolext.c

@@ -0,0 +1,157 @@
+/*
+ * protocolext.c: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <vdr/device.h>
+#include <vdr/plugin.h>
+
+#include "common.h"
+#include "config.h"
+#include "protocolext.h"
+
+cIptvProtocolExt::cIptvProtocolExt()
+: pid(-1),
+  scriptFile(""),
+  scriptParameter(0)
+{
+  debug("cIptvProtocolExt::cIptvProtocolExt()\n");
+}
+
+cIptvProtocolExt::~cIptvProtocolExt()
+{
+  debug("cIptvProtocolExt::~cIptvProtocolExt()\n");
+  // Drop the socket connection
+  cIptvProtocolExt::Close();
+}
+
+void cIptvProtocolExt::ExecuteScript(void)
+{
+  debug("cIptvProtocolExt::ExecuteScript()\n");
+  // Check if already executing
+  if (pid > 0) {
+     error("Cannot execute script!");
+     return;
+     }
+  // Let's fork
+  ERROR_IF_RET((pid = fork()) == -1, "fork()", return);
+  // Check if child process
+  if (pid == 0) {
+     // Close all dup'ed filedescriptors
+     int MaxPossibleFileDescriptors = getdtablesize();
+     for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
+         close(i);
+     // Execute the external script
+     cString cmd = cString::sprintf("%s %d %d", *scriptFile, scriptParameter, socketPort);
+     debug("cIptvProtocolExt::ExecuteScript(child): %s\n", *cmd);
+     if (execl("/bin/sh", "sh", "-c", *cmd, (char *)NULL) == -1) {
+        error("Script execution failed: %s", *cmd);
+        _exit(-1);
+        }
+     _exit(0);
+     }
+  else {
+     debug("cIptvProtocolExt::ExecuteScript(): pid=%d\n", pid);
+     }
+}
+
+void cIptvProtocolExt::TerminateScript(void)
+{
+  debug("cIptvProtocolExt::TerminateScript(): pid=%d\n", pid);
+  if (pid > 0) {
+     const unsigned int timeoutms = 100;
+     unsigned int waitms = 0;
+     siginfo_t waitStatus;
+     bool waitOver = false;
+     // signal and wait for termination
+     int retval = kill(pid, SIGINT);
+     ERROR_IF_RET(retval < 0, "kill()", waitOver = true);
+     while (!waitOver) {
+       retval = 0;
+       waitms += timeoutms;
+       if ((waitms % 2000) == 0) {
+          error("Script '%s' won't terminate - killing it!", *scriptFile);
+          kill(pid, SIGKILL);
+          }
+       // Clear wait status to make sure child exit status is accessible
+       memset(&waitStatus, '\0', sizeof(waitStatus));
+       // Wait for child termination
+       retval = waitid(P_PID, pid, &waitStatus, (WNOHANG | WEXITED));
+       ERROR_IF_RET(retval < 0, "waitid()", waitOver = true);
+       // These are the acceptable conditions under which child exit is
+       // regarded as successful
+       if (!retval && waitStatus.si_pid && (waitStatus.si_pid == pid) &&
+          ((waitStatus.si_code == CLD_EXITED) || (waitStatus.si_code == CLD_KILLED))) {
+          debug("Child (%d) exited as expected\n", pid);
+          waitOver = true;
+          }
+       // Unsuccessful wait, avoid busy looping
+       if (!waitOver)
+          cCondWait::SleepMs(timeoutms);
+       }
+     pid = -1;
+     }
+}
+
+bool cIptvProtocolExt::Open(void)
+{
+  debug("cIptvProtocolExt::Open()\n");
+  // Reject empty script files
+  if (!strlen(*scriptFile))
+     return false;
+  // Create the listening socket
+  OpenSocket(socketPort);
+  // Execute the external script
+  ExecuteScript();
+  isActive = true;
+  return true;
+}
+
+bool cIptvProtocolExt::Close(void)
+{
+  debug("cIptvProtocolExt::Close()\n");
+  // Close the socket
+  CloseSocket();
+  // Terminate the external script
+  TerminateScript();
+  isActive = false;
+  return true;
+}
+
+int cIptvProtocolExt::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+{
+  return cIptvUdpSocket::Read(BufferAddr, BufferLen);
+}
+
+bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int Index)
+{
+  debug("cIptvProtocolExt::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+  if (!isempty(Location)) {
+     struct stat stbuf;
+     // Update script file and parameter
+     scriptFile = cString::sprintf("%s/%s", IptvConfig.GetConfigDirectory(), Location);
+     if ((stat(*scriptFile, &stbuf) != 0) || (strstr(*scriptFile, "..") != 0)) {
+        error("Non-existent or relative path script '%s'", *scriptFile);
+        return false;
+        }
+     scriptParameter = Parameter;
+     // Update listen port
+     socketPort = IptvConfig.GetExtProtocolBasePort() + Index;
+     }
+  return true;
+}
+
+cString cIptvProtocolExt::GetInformation(void)
+{
+  //debug("cIptvProtocolExt::GetInformation()");
+  return cString::sprintf("ext://%s:%d", *scriptFile, scriptParameter);
+}

protocolext.h

@@ -0,0 +1,36 @@
+/*
+ * protocolext.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __IPTV_PROTOCOLEXT_H
+#define __IPTV_PROTOCOLEXT_H
+
+#include <arpa/inet.h>
+#include "protocolif.h"
+#include "socket.h"
+
+class cIptvProtocolExt : public cIptvUdpSocket, public cIptvProtocolIf {
+private:
+  int pid;
+  cString scriptFile;
+  int scriptParameter;
+
+private:
+  void TerminateScript(void);
+  void ExecuteScript(void);
+
+public:
+  cIptvProtocolExt();
+  virtual ~cIptvProtocolExt();
+  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);
+  cString GetInformation(void);
+};
+
+#endif // __IPTV_PROTOCOLEXT_H
+

protocolfile.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolfile.c,v 1.10 2007/10/07 22:54:09 rahrenbe Exp $
  */
 
 #include <fcntl.h>
@@ -16,38 +15,30 @@
 #include "protocolfile.h"
 
 cIptvProtocolFile::cIptvProtocolFile()
-: readBufferLen(TS_SIZE * IptvConfig.GetReadBufferTsCount()),
+: fileDelay(0),
+  fileStream(NULL),
   isActive(false)
 {
   debug("cIptvProtocolFile::cIptvProtocolFile()\n");
-  streamAddr = strdup("");
+  fileLocation = strdup("");
-  // Allocate receive buffer
-  readBuffer = MALLOC(unsigned char, readBufferLen);
-  if (!readBuffer)
-     error("ERROR: MALLOC() failed in ProtocolFile()");
 }
 
 cIptvProtocolFile::~cIptvProtocolFile()
 {
   debug("cIptvProtocolFile::~cIptvProtocolFile()\n");
   // Drop open handles
-  Close();
+  cIptvProtocolFile::Close();
   // Free allocated memory
-  free(streamAddr);
+  free(fileLocation);
-  free(readBuffer);
 }
 
 bool cIptvProtocolFile::OpenFile(void)
 {
   debug("cIptvProtocolFile::OpenFile()\n");
   // Check that stream address is valid
-  if (!isActive && !isempty(streamAddr)) {
+  if (!isActive && !isempty(fileLocation)) {
-     fileStream = fopen(streamAddr, "rb");
+     fileStream = fopen(fileLocation, "rb");
-     if (ferror(fileStream) || !fileStream) {
+     ERROR_IF_RET(!fileStream || ferror(fileStream), "fopen()", return false);
-        char tmp[64];
-        error("ERROR: fopen(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        return false;
-        }
      // Update active flag
      isActive = true;
      }
@@ -58,17 +49,16 @@ void cIptvProtocolFile::CloseFile(void)
 {
   debug("cIptvProtocolFile::CloseFile()\n");
   // Check that file stream is valid
-  if (isActive && !isempty(streamAddr)) {
+  if (isActive && !isempty(fileLocation)) {
      fclose(fileStream);
      // Update active flag
      isActive = false;
      }
 }
 
-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");
@@ -79,19 +69,19 @@ int cIptvProtocolFile::Read(unsigned char* *BufferAddr)
       rewind(fileStream);
    // Sleep before reading the file stream to prevent aggressive busy looping
    // and prevent transfer ringbuffer overflows
-   if (streamPort)
+   if (fileDelay)
-      cCondWait::SleepMs(streamPort);
+      cCondWait::SleepMs(fileDelay);
    // This check is to prevent a race condition where file may be switched off
    // 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 (int)fread(BufferAddr, sizeof(unsigned char), BufferLen, fileStream);
    return -1;
 }
 
 bool cIptvProtocolFile::Open(void)
 {
-  debug("cIptvProtocolFile::Open(): streamAddr=%s\n", streamAddr);
+  debug("cIptvProtocolFile::Open()\n");
   // Open the file stream
   OpenFile();
   return true;
@@ -99,21 +89,21 @@ bool cIptvProtocolFile::Open(void)
 
 bool cIptvProtocolFile::Close(void)
 {
-  debug("cIptvProtocolFile::Close(): streamAddr=%s\n", streamAddr);
+  debug("cIptvProtocolFile::Close()\n");
   // Close the file stream
   CloseFile();
   return true;
 }
 
-bool cIptvProtocolFile::Set(const char* Address, const int Port)
+bool cIptvProtocolFile::Set(const char* Location, const int Parameter, const int Index)
 {
-  debug("cIptvProtocolFile::Set(): %s:%d\n", Address, Port);
+  debug("cIptvProtocolFile::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
-  if (!isempty(Address)) {
+  if (!isempty(Location)) {
      // Close the file stream
      CloseFile();
      // Update stream address and port
-     streamAddr = strcpyrealloc(streamAddr, Address);
+     fileLocation = strcpyrealloc(fileLocation, Location);
-     streamPort = Port;
+     fileDelay = Parameter;
      // Open the file for input
      OpenFile();
      }
@@ -123,5 +113,5 @@ bool cIptvProtocolFile::Set(const char* Address, const int Port)
 cString cIptvProtocolFile::GetInformation(void)
 {
   //debug("cIptvProtocolFile::GetInformation()");
-  return cString::sprintf("file://%s:%d", streamAddr, streamPort);
+  return cString::sprintf("file://%s:%d", fileLocation, fileDelay);
 }

protocolfile.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolfile.h,v 1.5 2007/10/07 22:54:09 rahrenbe Exp $
  */
 
 #ifndef __IPTV_PROTOCOLFILE_H
@@ -14,11 +13,9 @@
 
 class cIptvProtocolFile : public cIptvProtocolIf {
 private:
-  char* streamAddr;
+  char* fileLocation;
-  int streamPort;
+  int fileDelay;
   FILE* fileStream;
-  unsigned char* readBuffer;
-  unsigned int readBufferLen;
   bool isActive;
 
 private:
@@ -28,11 +25,11 @@ private:
 public:
   cIptvProtocolFile();
   virtual ~cIptvProtocolFile();
-  virtual int Read(unsigned char* *BufferAddr);
+  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  virtual bool Set(const char* Address, const int Port);
+  bool Set(const char* Location, const int Parameter, const int Index);
-  virtual bool Open(void);
+  bool Open(void);
-  virtual bool Close(void);
+  bool Close(void);
-  virtual cString GetInformation(void);
+  cString GetInformation(void);
 };
 
 #endif // __IPTV_PROTOCOLFILE_H

protocolhttp.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolhttp.c,v 1.10 2007/10/07 22:54:09 rahrenbe Exp $
  */
 
 #include <sys/types.h>
@@ -20,88 +19,20 @@
 #include "protocolhttp.h"
 
 cIptvProtocolHttp::cIptvProtocolHttp()
-: streamPort(3000),
-  socketDesc(-1),
-  readBufferLen(TS_SIZE * IptvConfig.GetReadBufferTsCount()),
-  isActive(false)
 {
   debug("cIptvProtocolHttp::cIptvProtocolHttp()\n");
   streamAddr = strdup("");
   streamPath = strdup("/");
-  // Allocate receive buffer
-  readBuffer = MALLOC(unsigned char, readBufferLen);
-  if (!readBuffer)
-     error("ERROR: MALLOC() failed in ProtocolHttp()");
 }
 
 cIptvProtocolHttp::~cIptvProtocolHttp()
 {
   debug("cIptvProtocolHttp::~cIptvProtocolHttp()\n");
   // Close the socket
-  Close();
+  cIptvProtocolHttp::Close();
   // Free allocated memory
   free(streamPath);
   free(streamAddr);
-  free(readBuffer);
-}
-
-bool cIptvProtocolHttp::OpenSocket(const int Port)
-{
-  debug("cIptvProtocolHttp::OpenSocket()\n");
-  // If socket is there already and it is bound to a different port, it must
-  // be closed first
-  if (Port != streamPort) {
-     debug("cIptvProtocolHttp::OpenSocket(): Socket tear-down\n");
-     CloseSocket();
-     }
-  // Bind to the socket if it is not active already
-  if (socketDesc < 0) {
-     int yes = 1;     
-     // Create socket
-     socketDesc = socket(PF_INET, SOCK_STREAM, 0);
-     if (socketDesc < 0) {
-        char tmp[64];
-        error("ERROR: socket(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        return false;
-        }
-
-     // Make it use non-blocking I/O to avoid stuck read calls
-     if (fcntl(socketDesc, F_SETFL, O_NONBLOCK)) {
-        char tmp[64];
-        error("ERROR: fcntl(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        CloseSocket();
-        return false;
-        }
-
-     // Allow multiple sockets to use the same PORT number
-     if (setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes,
-		    sizeof(yes)) < 0) {
-        char tmp[64];
-        error("ERROR: setsockopt(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        CloseSocket();
-        return false;
-        }
-
-     // Create default socket
-     memset(&sockAddr, '\0', sizeof(sockAddr));
-     sockAddr.sin_family = AF_INET;
-     sockAddr.sin_port = htons(Port);
-     sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-     // Update stream port
-     streamPort = Port;
-     }
-  return true;
-}
-
-void cIptvProtocolHttp::CloseSocket(void)
-{
-  debug("cIptvProtocolHttp::CloseSocket()\n");
-  // Check if socket exists
-  if (socketDesc >= 0) {
-     close(socketDesc);
-     socketDesc = -1;
-     }
 }
 
 bool cIptvProtocolHttp::Connect(void)
@@ -110,11 +41,11 @@ bool cIptvProtocolHttp::Connect(void)
   // Check that stream address is valid
   if (!isActive && !isempty(streamAddr) && !isempty(streamPath)) {
      // Ensure that socket is valid
-     OpenSocket(streamPort);
+     OpenSocket(socketPort);
 
      // First try only the IP address
      sockAddr.sin_addr.s_addr = inet_addr(streamAddr);
-     
+
      if (sockAddr.sin_addr.s_addr == INADDR_NONE) {
         debug("Cannot convert %s directly to internet address\n", streamAddr);
 
@@ -122,41 +53,22 @@ bool cIptvProtocolHttp::Connect(void)
         struct hostent *host;
         host = gethostbyname(streamAddr);
         if (!host) {
-           error("%s is not valid address\n", streamAddr);
            char tmp[64];
-           error("ERROR: %s", strerror_r(h_errno, tmp, sizeof(tmp)));
+           error("%s is not valid address: %s", streamAddr, strerror_r(h_errno, tmp, sizeof(tmp)));
            return false;
            }
 
         sockAddr.sin_addr.s_addr = inet_addr(*host->h_addr_list);
         }
 
-     int err = connect(socketDesc, (struct sockaddr*)&sockAddr,
+     int err = connect(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
-		       sizeof(sockAddr));
      // Non-blocking sockets always report in-progress error when connected
-     if (err < 0 && errno != EINPROGRESS) {
+     ERROR_IF_FUNC(err < 0 && errno != EINPROGRESS, "connect()", CloseSocket(), return false);
-        char tmp[64];
+     // Select with 800ms timeout on the socket completion, check if it is writable
-        error("ERROR: Connect(): %s", strerror_r(errno, tmp, sizeof(tmp)));
+     int retval = select_single_desc(socketDesc, 800000, true);
-        CloseSocket();
+     if (retval < 0)
-        return false;
+        return retval;
-        }
 
-     // Select on the socket completion
-     struct timeval tv;
-     tv.tv_sec = 1;
-     tv.tv_usec = 0;
-     // Use select to check socket writability
-     fd_set wfds;
-     FD_ZERO(&wfds);
-     FD_SET(socketDesc, &wfds);
-     int retval = select(socketDesc + 1, NULL, &wfds, NULL, &tv);
-     // Check if error
-     if (retval < 0) {
-        char tmp[64];
-        error("ERROR: select(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        return -1;
-        }
-     
      // Select has returned. Get socket errors if there are any
      int socketStatus = 0;
      socklen_t len = sizeof(socketStatus);
@@ -164,32 +76,23 @@ bool cIptvProtocolHttp::Connect(void)
 
      // If not any errors, then socket must be ready and connected
      if (socketStatus != 0) {
-        error("Cannot connect to %s\n", streamAddr);
         char tmp[64];
-        error("ERROR: %s", strerror_r(socketStatus, tmp, sizeof(tmp)));
+        error("Cannot connect to %s: %s", streamAddr, strerror_r(socketStatus, tmp, sizeof(tmp)));
         CloseSocket();
         return false;
         }
 
      // 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);
+     ssize_t err2 = send(socketDesc, buffer, strlen(buffer), 0);
-     if (err < 0) {
+     ERROR_IF_FUNC(err2 < 0, "send()", CloseSocket(), return false);
-        char tmp[64];
-        error("ERROR: send(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        CloseSocket();
-        return false;
-        }
 
      // Now process headers
      if (!ProcessHeaders()) {
@@ -208,46 +111,35 @@ 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;
 }
 
 bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
-				      unsigned int &recvLen)
+                                      unsigned int &recvLen)
 {
   debug("cIptvProtocolHttp::GetHeaderLine()\n");
   bool linefeed = false;
   bool newline = false;
-  char buf[256];
+  char buf[4096];
   char *bufptr = buf;
   memset(buf, '\0', sizeof(buf));
   recvLen = 0;
 
   while (!newline || !linefeed) {
     socklen_t addrlen = sizeof(sockAddr);
-    // Set argument point to read buffer
+    // Wait 500ms for data
-    // Wait for data
+    int retval = select_single_desc(socketDesc, 500000, false);
-    struct timeval tv;
-    tv.tv_sec = 0;
-    tv.tv_usec = 500000;
-    // Use select
-    fd_set rfds;
-    FD_ZERO(&rfds);
-    FD_SET(socketDesc, &rfds);
-    int retval = select(socketDesc + 1, &rfds, NULL, NULL, &tv);
     // Check if error
-    if (retval < 0) {
+    if (retval < 0)
-       char tmp[64];
-       error("ERROR: select(): %s", strerror_r(errno, tmp, sizeof(tmp)));
        return false;
-       }
     // Check if data available
     else if (retval) {
-       int retval = recvfrom(socketDesc, bufptr, 1, MSG_DONTWAIT,
+       ssize_t retval = recvfrom(socketDesc, bufptr, 1, MSG_DONTWAIT,
                              (struct sockaddr *)&sockAddr, &addrlen);
        if (retval <= 0)
           return false;
@@ -266,6 +158,7 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
        // Check that buffers won't be exceeded
        if (recvLen >= sizeof(buf) || recvLen >= destLen) {
           error("Header wouldn't fit into buffer\n");
+          recvLen = 0;
           return false;
           }
        }
@@ -284,96 +177,71 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
   unsigned int lineLength = 0;
   int response = 0;
   bool responseFound = false;
-  char buf[256];
+  char buf[4096];
 
   while (!responseFound || lineLength != 0) {
     memset(buf, '\0', sizeof(buf));
     if (!GetHeaderLine(buf, sizeof(buf), lineLength))
        return false;
-    if (!responseFound && sscanf(buf, "HTTP/1.%*i %i ",&response) != 1) {
+    if (!responseFound && sscanf(buf, "HTTP/1.%*i %i ", &response) != 1) {
        error("Expected HTTP header not found\n");
        continue;
        }
     else
        responseFound = true;
     if (response != 200) {
-       error("ERROR: %s\n", buf);
+       error("%s\n", buf);
        return false;
        }
     }
   return true;
 }
 
-int cIptvProtocolHttp::Read(unsigned char* *BufferAddr)
-{
-  //debug("cIptvProtocolHttp::Read()\n");
-  socklen_t addrlen = sizeof(sockAddr);
-  // Set argument point to read buffer
-  *BufferAddr = readBuffer;
-  // Wait for data
-  struct timeval tv;
-  tv.tv_sec = 0;
-  tv.tv_usec = 500000;
-  // Use select
-  fd_set rfds;
-  FD_ZERO(&rfds);
-  FD_SET(socketDesc, &rfds);
-  int retval = select(socketDesc + 1, &rfds, NULL, NULL, &tv);
-  // Check if error
-  if (retval < 0) {
-     char tmp[64];
-     error("ERROR: select(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-     return -1;
-     }
-  // Check if data available
-  else if (retval) {
-     // Read data from socket
-     return recvfrom(socketDesc, readBuffer, readBufferLen, MSG_DONTWAIT,
-                     (struct sockaddr *)&sockAddr, &addrlen);
-     }
-  return 0;
-}
-
 bool cIptvProtocolHttp::Open(void)
 {
-  debug("cIptvProtocolHttp::Open(): streamAddr=%s\n", streamAddr);
+  debug("cIptvProtocolHttp::Open()\n");
   // Connect the socket
   return Connect();
 }
 
 bool cIptvProtocolHttp::Close(void)
 {
-  debug("cIptvProtocolHttp::Close(): streamAddr=%s\n", streamAddr);
+  debug("cIptvProtocolHttp::Close()\n");
   // Disconnect the current stream
   Disconnect();
   return true;
 }
 
-bool cIptvProtocolHttp::Set(const char* Address, const int Port)
+int cIptvProtocolHttp::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
-  debug("cIptvProtocolHttp::Set(): %s:%d\n", Address, Port);
+  return cIptvTcpSocket::Read(BufferAddr, BufferLen);
-  if (!isempty(Address)) {
+}
-    // Disconnect the current socket
+
-    Disconnect();
+bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int Index)
-    // Update stream address, path and port
+{
-    streamAddr = strcpyrealloc(streamAddr, Address);
+  debug("cIptvProtocolHttp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
-    char *path = strstr(streamAddr, "/");
+  if (!isempty(Location)) {
-    if (path) {
+     // Disconnect the current socket
-       streamPath = strcpyrealloc(streamPath, path);
+     Disconnect();
-       *path = 0;
+     // Update stream address, path and port
-       }
+     streamAddr = strcpyrealloc(streamAddr, Location);
-    else
+     char *path = strstr(streamAddr, "/");
-       streamPath = strcpyrealloc(streamPath, "/");
+     if (path) {
-    streamPort = Port;
+        streamPath = strcpyrealloc(streamPath, path);
-    debug("http://%s:%d%s\n", streamAddr, streamPort, streamPath);
+        *path = 0;
-    // Re-connect the socket
+        }
-    Connect();
+     else
-    }
+        streamPath = strcpyrealloc(streamPath, "/");
+     socketPort = Parameter;
+     //debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
+     // Re-connect the socket
+     Connect();
+     }
   return true;
 }
 
 cString cIptvProtocolHttp::GetInformation(void)
 {
   //debug("cIptvProtocolHttp::GetInformation()");
-  return cString::sprintf("http://%s:%d%s", streamAddr, streamPort, streamPath);
+  return cString::sprintf("http://%s:%d%s", streamAddr, socketPort, streamPath);
 }

protocolhttp.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolhttp.h,v 1.7 2007/10/07 22:54:09 rahrenbe Exp $
  */
 
 #ifndef __IPTV_PROTOCOLHTTP_H
@@ -11,35 +10,27 @@
 
 #include <arpa/inet.h>
 #include "protocolif.h"
+#include "socket.h"
 
-class cIptvProtocolHttp : public cIptvProtocolIf {
+class cIptvProtocolHttp : public cIptvTcpSocket, public cIptvProtocolIf {
 private:
   char* streamAddr;
   char* streamPath;
-  int streamPort;
-  int socketDesc;
-  unsigned char* readBuffer;
-  unsigned int readBufferLen;
-  struct sockaddr_in sockAddr;
-  bool isActive;
 
 private:
-  bool OpenSocket(const int Port);
-  void CloseSocket(void);
   bool Connect(void);
   bool Disconnect(void);
-  bool GetHeaderLine(char* dest, unsigned int destLen,
+  bool GetHeaderLine(char* dest, unsigned int destLen, unsigned int &recvLen);
-		     unsigned int &recvLen);
   bool ProcessHeaders(void);
 
 public:
   cIptvProtocolHttp();
   virtual ~cIptvProtocolHttp();
-  virtual int Read(unsigned char* *BufferAddr);
+  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  virtual bool Set(const char* Address, const int Port);
+  bool Set(const char* Location, const int Parameter, const int Index);
-  virtual bool Open(void);
+  bool Open(void);
-  virtual bool Close(void);
+  bool Close(void);
-  virtual cString GetInformation(void);
+  cString GetInformation(void);
 };
 
 #endif // __IPTV_PROTOCOLHTTP_H

protocolif.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolif.h,v 1.5 2007/10/07 22:54:09 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* Address, const int Port) = 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.11 2007/10/07 22:54:09 rahrenbe Exp $
  */
 
 #include <sys/types.h>
@@ -17,91 +16,21 @@
 #include "common.h"
 #include "config.h"
 #include "protocoludp.h"
+#include "socket.h"
 
 cIptvProtocolUdp::cIptvProtocolUdp()
-: streamPort(1234),
-  socketDesc(-1),
-  readBufferLen(TS_SIZE * IptvConfig.GetReadBufferTsCount()),
-  isActive(false)
 {
   debug("cIptvProtocolUdp::cIptvProtocolUdp()\n");
   streamAddr = strdup("");
-  // Allocate receive buffer
-  readBuffer = MALLOC(unsigned char, readBufferLen);
-  if (!readBuffer)
-     error("ERROR: MALLOC() failed in ProtocolUdp()");
 }
 
 cIptvProtocolUdp::~cIptvProtocolUdp()
 {
   debug("cIptvProtocolUdp::~cIptvProtocolUdp()\n");
   // Drop the multicast group and close the socket
-  Close();
+  cIptvProtocolUdp::Close();
   // Free allocated memory
   free(streamAddr);
-  free(readBuffer);
-}
-
-bool cIptvProtocolUdp::OpenSocket(const int Port)
-{
-  debug("cIptvProtocolUdp::OpenSocket()\n");
-  // If socket is there already and it is bound to a different port, it must
-  // be closed first
-  if (Port != streamPort) {
-     debug("cIptvProtocolUdp::OpenSocket(): Socket tear-down\n");
-     CloseSocket();
-     }
-  // Bind to the socket if it is not active already
-  if (socketDesc < 0) {
-     int yes = 1;     
-     // Create socket
-     socketDesc = socket(PF_INET, SOCK_DGRAM, 0);
-     if (socketDesc < 0) {
-        char tmp[64];
-        error("ERROR: socket(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        return false;
-        }
-     // Make it use non-blocking I/O to avoid stuck read calls
-     if (fcntl(socketDesc, F_SETFL, O_NONBLOCK)) {
-        char tmp[64];
-        error("ERROR: fcntl(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        CloseSocket();
-        return false;
-        }
-     // Allow multiple sockets to use the same PORT number
-     if (setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes,
-		    sizeof(yes)) < 0) {
-        char tmp[64];
-        error("ERROR: setsockopt(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        CloseSocket();
-        return false;
-        }
-     // Bind socket
-     memset(&sockAddr, '\0', sizeof(sockAddr));
-     sockAddr.sin_family = AF_INET;
-     sockAddr.sin_port = htons(Port);
-     sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-     int err = bind(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
-     if (err < 0) {
-        char tmp[64];
-        error("ERROR: bind(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        CloseSocket();
-        return false;
-        }
-     // Update stream port
-     streamPort = Port;
-     }
-  return true;
-}
-
-void cIptvProtocolUdp::CloseSocket(void)
-{
-  debug("cIptvProtocolUdp::CloseSocket()\n");
-  // Check if socket exists
-  if (socketDesc >= 0) {
-     close(socketDesc);
-     socketDesc = -1;
-     }
 }
 
 bool cIptvProtocolUdp::JoinMulticast(void)
@@ -110,18 +39,14 @@ bool cIptvProtocolUdp::JoinMulticast(void)
   // Check that stream address is valid
   if (!isActive && !isempty(streamAddr)) {
      // Ensure that socket is valid
-     OpenSocket(streamPort);
+     OpenSocket(socketPort);
      // Join a new multicast group
      struct ip_mreq mreq;
      mreq.imr_multiaddr.s_addr = inet_addr(streamAddr);
      mreq.imr_interface.s_addr = htonl(INADDR_ANY);
      int err = setsockopt(socketDesc, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq,
                           sizeof(mreq));
-     if (err < 0) {
+     ERROR_IF_RET(err < 0, "setsockopt()", return false);
-        char tmp[64];
-        error("ERROR: setsockopt(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        return false;
-        }
      // Update multicasting flag
      isActive = true;
      }
@@ -134,89 +59,23 @@ bool cIptvProtocolUdp::DropMulticast(void)
   // Check that stream address is valid
   if (isActive && !isempty(streamAddr)) {
       // Ensure that socket is valid
-      OpenSocket(streamPort);
+      OpenSocket(socketPort);
       // Drop the multicast group
       struct ip_mreq mreq;
       mreq.imr_multiaddr.s_addr = inet_addr(streamAddr);
       mreq.imr_interface.s_addr = htonl(INADDR_ANY);
       int err = setsockopt(socketDesc, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq,
                            sizeof(mreq));
-      if (err < 0) {
+      ERROR_IF_RET(err < 0, "setsockopt()", return false);
-         char tmp[64];
-         error("ERROR: setsockopt(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-         return false;
-         }
       // Update multicasting flag
       isActive = false;
      }
   return true;
 }
 
-int cIptvProtocolUdp::Read(unsigned char* *BufferAddr)
-{
-  //debug("cIptvProtocolUdp::Read()\n");
-  socklen_t addrlen = sizeof(sockAddr);
-  // Set argument point to read buffer
-  *BufferAddr = readBuffer;
-  // Wait for data
-  struct timeval tv;
-  tv.tv_sec = 0;
-  tv.tv_usec = 500000;
-  // Use select
-  fd_set rfds;
-  FD_ZERO(&rfds);
-  FD_SET(socketDesc, &rfds);
-  int retval = select(socketDesc + 1, &rfds, NULL, NULL, &tv);
-  // Check if error
-  if (retval < 0) {
-     char tmp[64];
-     error("ERROR: select(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-     return -1;
-     }
-  // Check if data available
-  else if (retval) {
-     // Read data from socket
-     int len = recvfrom(socketDesc, readBuffer, readBufferLen, MSG_DONTWAIT,
-                        (struct sockaddr *)&sockAddr, &addrlen);
-     if ((len > 0) && (readBuffer[0] == 0x47)) {
-        // Set argument point to read buffer
-        *BufferAddr = &readBuffer[0];
-        return len;
-        }
-     else if (len > 3) {
-        // http://www.networksorcery.com/enp/rfc/rfc2250.txt
-        // version
-        unsigned int v = (readBuffer[0] >> 6) & 0x03;
-        // extension bit
-        unsigned int x = (readBuffer[0] >> 4) & 0x01;
-        // cscr count
-        unsigned int cc = readBuffer[0] & 0x0F;
-        // payload type
-        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, payload type is MPEG2 TS
-        // and payload contains multiple of TS packet data
-        if ((v == 2) && (pt == 33) && (((len - headerlen) % TS_SIZE) == 0)) {
-           // Set argument point to payload in read buffer
-           *BufferAddr = &readBuffer[headerlen];
-           return (len - headerlen);
-           }
-        }
-     }
-  return 0;
-}
-
 bool cIptvProtocolUdp::Open(void)
 {
-  debug("cIptvProtocolUdp::Open(): streamAddr=%s\n", streamAddr);
+  debug("cIptvProtocolUdp::Open()\n");
   // Join a new multicast group
   JoinMulticast();
   return true;
@@ -224,7 +83,7 @@ bool cIptvProtocolUdp::Open(void)
 
 bool cIptvProtocolUdp::Close(void)
 {
-  debug("cIptvProtocolUdp::Close(): streamAddr=%s\n", streamAddr);
+  debug("cIptvProtocolUdp::Close()\n");
   // Drop the multicast group
   DropMulticast();
   // Close the socket
@@ -232,15 +91,20 @@ bool cIptvProtocolUdp::Close(void)
   return true;
 }
 
-bool cIptvProtocolUdp::Set(const char* Address, const int Port)
+int cIptvProtocolUdp::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
-  debug("cIptvProtocolUdp::Set(): %s:%d\n", Address, Port);
+  return cIptvUdpSocket::Read(BufferAddr, BufferLen);
-  if (!isempty(Address)) {
+}
+
+bool cIptvProtocolUdp::Set(const char* Location, const int Parameter, const int Index)
+{
+  debug("cIptvProtocolUdp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
+  if (!isempty(Location)) {
     // Drop the multicast group
     DropMulticast();
     // Update stream address and port
-    streamAddr = strcpyrealloc(streamAddr, Address);
+    streamAddr = strcpyrealloc(streamAddr, Location);
-    streamPort = Port;
+    socketPort = Parameter;
     // Join a new multicast group
     JoinMulticast();
     }
@@ -250,5 +114,5 @@ bool cIptvProtocolUdp::Set(const char* Address, const int Port)
 cString cIptvProtocolUdp::GetInformation(void)
 {
   //debug("cIptvProtocolUdp::GetInformation()");
-  return cString::sprintf("udp://%s:%d", streamAddr, streamPort);
+  return cString::sprintf("udp://%s:%d", streamAddr, socketPort);
 }

protocoludp.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocoludp.h,v 1.8 2007/10/07 22:54:09 rahrenbe Exp $
  */
 
 #ifndef __IPTV_PROTOCOLUDP_H
@@ -11,31 +10,24 @@
 
 #include <arpa/inet.h>
 #include "protocolif.h"
+#include "socket.h"
 
-class cIptvProtocolUdp : public cIptvProtocolIf {
+class cIptvProtocolUdp : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
   char* streamAddr;
-  int streamPort;
-  int socketDesc;
-  unsigned char* readBuffer;
-  unsigned int readBufferLen;
-  struct sockaddr_in sockAddr;
-  bool isActive;
 
 private:
-  bool OpenSocket(const int Port);
-  void CloseSocket(void);
   bool JoinMulticast(void);
   bool DropMulticast(void);
 
 public:
   cIptvProtocolUdp();
   virtual ~cIptvProtocolUdp();
-  virtual int Read(unsigned char* *BufferAddr);
+  int Read(unsigned char* BufferAddr, unsigned int BufferLen);
-  virtual bool Set(const char* Address, const int Port);
+  bool Set(const char* Location, const int Parameter, const int Index);
-  virtual bool Open(void);
+  bool Open(void);
-  virtual bool Close(void);
+  bool Close(void);
-  virtual cString GetInformation(void);
+  cString GetInformation(void);
 };
 
 #endif // __IPTV_PROTOCOLUDP_H

sectionfilter.c

@@ -3,16 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sectionfilter.c,v 1.11 2007/10/08 16:24:48 rahrenbe Exp $
  */
 
 #include "sectionfilter.h"
-#include "statistics.h"
 
-#define IPTV_FILTER_FILENAME "/tmp/vdr-iptv%d.filter%d"
+cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
-
+                                       uint16_t Pid, uint8_t Tid, uint8_t Mask)
-cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
-				       u_short Pid, u_char Tid, u_char Mask)
 : pusi_seen(0),
   feedcc(0),
   doneq(0),
@@ -21,192 +17,122 @@ cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
   seclen(0),
   tsfeedp(0),
   pid(Pid),
+  devid(DeviceIndex),
   id(Index)
 {
-  //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] = (uint8_t)(mask & mode);
-    local_doneq |= maskandnotmode[i] = mask & ~mode;
+      maskandnotmode[i] = (uint8_t)(mask & ~mode);
-  }
+      local_doneq |= maskandnotmode[i];
+      }
   doneq = local_doneq ? 1 : 0;
 
-  struct stat sb;
+  // Create sockets
-  stat(pipeName, &sb);
+  socket[0] = socket[1] = -1;
-  if (S_ISFIFO(sb.st_mode))
+  if (socketpair(AF_UNIX, SOCK_DGRAM, 0, socket) != 0) {
-     unlink(pipeName);
-  int err = mknod(pipeName, 0644 | S_IFIFO, 0);
-  if (err < 0) {
      char tmp[64];
-     error("ERROR: mknod(): %s", strerror_r(errno, tmp, sizeof(tmp)));
+     error("Opening section filter sockets failed (device=%d id=%d): %s\n", devid, id, strerror_r(errno, tmp, sizeof(tmp)));
-     return;
+     }
+  else if ((fcntl(socket[0], F_SETFL, O_NONBLOCK) != 0) || (fcntl(socket[1], F_SETFL, O_NONBLOCK) != 0)) {
+     char tmp[64];
+     error("Setting section filter socket to non-blocking mode failed (device=%d id=%d): %s", devid, id, strerror_r(errno, tmp, sizeof(tmp)));
      }
-
-  // Create descriptors
-  fifoDescriptor = open(pipeName, O_RDWR | O_NONBLOCK);
-  readDescriptor = open(pipeName, O_RDONLY | O_NONBLOCK);
 }
 
 cIptvSectionFilter::~cIptvSectionFilter()
 {
-  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d)\n", id);
+  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d, %d)\n", devid, id);
-  close(fifoDescriptor);
+  int tmp = socket[1];
-  close(readDescriptor);
+  socket[1] = -1;
-  unlink(pipeName);
+  if (tmp >= 0)
-  memset(pipeName, '\0', sizeof(pipeName));
+     close(tmp);
-  fifoDescriptor = -1;
+  tmp = socket[0];
-  readDescriptor = -1;
+  socket[0] = -1;
+  if (tmp >= 0)
+     close(tmp);
+  secbuf = NULL;
 }
 
-void cIptvSectionFilter::SetPipeName(int deviceIndex)
+int cIptvSectionFilter::GetReadDesc(void)
 {
-  snprintf(pipeName, sizeof(pipeName), IPTV_FILTER_FILENAME, deviceIndex, id);
+  return socket[0];
 }
 
-int cIptvSectionFilter::GetReadDesc()
+inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *Data)
 {
-  return readDescriptor;
+  return (uint16_t)(3 + ((Data[1] & 0x0f) << 8) + Data[2]);
 }
 
-inline uint16_t cIptvSectionFilter::section_length(const uint8_t *buf)
+void cIptvSectionFilter::New(void)
 {
-  return 3 + ((buf[1] & 0x0f) << 8) + buf[2];
-}
-
-int cIptvSectionFilter::dmxdev_section_callback(const uint8_t *buffer1, size_t buffer1_len,
-                                                const uint8_t *buffer2, size_t buffer2_len,
-                                                enum dmx_success success)
-{
-  struct timeval tv;
-  tv.tv_sec = 0;
-  tv.tv_usec = 0;
-  fd_set rfds;
-  FD_ZERO(&rfds);
-  FD_SET(fifoDescriptor, &rfds);
-  int retval = select(fifoDescriptor + 1, &rfds, NULL, NULL, &tv);
-
-  // Check if error
-  if (retval < 0) {
-     char tmp[64];
-     error("ERROR: select(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-     }
-  // There is no data in the fifo, more can be written
-  else 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);
-     if (retval < 0) {
-        char tmp[64];
-        error("ERROR: write(): %s", strerror_r(errno, tmp, sizeof(tmp)));
-        }
-     // Update statistics
-     AddStatistic(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++) {
+  if (secbuf) {
-      uint8_t local_xor = filter_value[i] ^ secbuf[i];
+     for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
-      if (maskandmode[i] & local_xor) {
+         uint8_t local_xor = (uint8_t)(filter_value[i] ^ secbuf[i]);
-#ifdef DEBUG_PRINTF
+         if (maskandmode[i] & local_xor)
-         printf("maskandmode discard\n");
+            return 0;
-#endif
+         neq |= (maskandnotmode[i] & local_xor);
-         return 0;
          }
-      neq |= maskandnotmode[i] & local_xor;
-      }
 
-  if (doneq && !neq) {
+     if (doneq && !neq)
-#ifdef DEBUG_PRINTF
+        return 0;
-     printf("doneq discard, doneq = 0x%X, neq = 0x%X\n", doneq, !neq);
+
-#endif
+     // There is no data in the read socket, more can be written
-     return 0;
+     if ((socket[0] >= 0) && (socket[1] >= 0) /*&& !select_single_desc(socket[0], 0, false)*/) {
+        ssize_t len = write(socket[1], secbuf, seclen);
+        ERROR_IF(len < 0, "write()");
+        // Update statistics
+        AddSectionStatistic(len, 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
+     len = (uint8_t)(DMX_MAX_SECFEED_SIZE - tsfeedp);
-     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;
@@ -214,108 +140,79 @@ 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 ||
+      if ((seclen_local <= 0) || (seclen_local > DMX_MAX_SECTION_SIZE) || ((seclen_local + secbufp) > limit))
-         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 = (uint8_t)(TS_SIZE - count);
 
-  uint8_t cc = buf[3] & 0x0f;
+  uint8_t cc = (uint8_t)(Data[3] & 0x0f);
   int ccok = ((feedcc + 1) & 0x0f) == cc;
-  feedcc = 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;
+        uint8_t after_len = (uint8_t)(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,49 +3,24 @@
  *
  * 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"
 
 class cIptvSectionFilter : public cIptvSectionStatistics {
 private:
-  enum dmx_success {
-    DMX_OK = 0, /* Received Ok */
-    DMX_LENGTH_ERROR, /* Incorrect length */
-    DMX_OVERRUN_ERROR, /* Receiver ring buffer overrun */
-    DMX_CRC_ERROR, /* Incorrect CRC */
-    DMX_FRAME_ERROR, /* Frame alignment error */
-    DMX_FIFO_ERROR, /* Receiver FIFO overrun */
-    DMX_MISSED_ERROR /* Receiver missed packet */
-  };
-
   enum dmx_limits {
     DMX_MAX_FILTER_SIZE  = 18,
     DMX_MAX_SECTION_SIZE = 4096,
-    DMX_MAX_SECFEED_SIZE = (DMX_MAX_SECTION_SIZE + 188)
+    DMX_MAX_SECFEED_SIZE = (DMX_MAX_SECTION_SIZE + TS_SIZE)
   };
 
-  int fifoDescriptor;
-  int readDescriptor;
-
   int pusi_seen;
   int feedcc;
   int doneq;
@@ -56,49 +31,32 @@ private:
   uint16_t seclen;
   uint16_t tsfeedp;
   uint16_t pid;
+
+  int devid;
   int id;
+  int socket[2];
 
   uint8_t filter_value[DMX_MAX_FILTER_SIZE];
   uint8_t filter_mask[DMX_MAX_FILTER_SIZE];
   uint8_t filter_mode[DMX_MAX_FILTER_SIZE];
-   
+
   uint8_t maskandmode[DMX_MAX_FILTER_SIZE];
   uint8_t maskandnotmode[DMX_MAX_FILTER_SIZE];
 
-  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, uint16_t Pid,
-                     u_char Mask);
+                     uint8_t Tid, uint8_t Mask);
-
   virtual ~cIptvSectionFilter();
-
+  void Process(const uint8_t* Data);
-  void ProcessData(const uint8_t* buf);
+  int GetReadDesc(void);
-
+  uint16_t GetPid(void) const { return pid; }
-  int GetReadDesc();
-  uint16_t GetPid() { return pid; }
 };
 
 #endif // __IPTV_SECTIONFILTER_H

setup.c

@@ -3,477 +3,16 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c,v 1.33 2007/10/14 18:51:21 rahrenbe Exp $
  */
 
-#include <string.h>
-
-#include <vdr/device.h>
-#include <vdr/interface.h>
 #include <vdr/status.h>
+#include <vdr/menu.h>
 
 #include "common.h"
 #include "config.h"
 #include "device.h"
 #include "setup.h"
 
-#ifndef trVDR
-#define trVDR(s) tr(s)
-#endif
-
-// --- cIptvMenuEditChannel --------------------------------------------------
-
-class cIptvMenuEditChannel : public cOsdMenu
-{
-private:
-  enum {
-    eProtocolUDP,
-    eProtocolHTTP,
-    eProtocolFILE,
-    eProtocolCount
-  };
-  struct tIptvChannel {
-    int frequency, source, protocol, port, vpid, ppid, tpid, sid, nid, tid, rid;
-    int apid[MAXAPIDS + 1], dpid[MAXDPIDS + 1], spid[MAXSPIDS + 1], caids[MAXCAIDS + 1];
-    char name[256], location[256];
-  } data;
-  cChannel *channel;
-  const char *protocols[eProtocolCount];
-  void Setup(void);
-  cString GetIptvSettings(const char *Param, int *Port, int *Protocol);
-  void GetChannelData(cChannel *Channel);
-  void SetChannelData(cChannel *Channel);
-
-public:
-  cIptvMenuEditChannel(cChannel *Channel, bool New = false);
-  virtual eOSState ProcessKey(eKeys Key);
-};
-
-cIptvMenuEditChannel::cIptvMenuEditChannel(cChannel *Channel, bool New)
-:cOsdMenu(trVDR("Edit channel"), 16)
-{
-  protocols[eProtocolUDP]  = tr("UDP");
-  protocols[eProtocolHTTP] = tr("HTTP");
-  protocols[eProtocolFILE] = tr("FILE");
-  channel = Channel;
-  GetChannelData(channel);
-  if (New) {
-     channel = NULL;
-     data.nid = 0;
-     data.tid = 0;
-     data.rid = 0;
-     }
-  Setup();
-}
-
-cString cIptvMenuEditChannel::GetIptvSettings(const char *Param, int *Port, int *Protocol)
-{
-  char *loc = NULL;
-  if (sscanf(Param, "IPTV|UDP|%a[^|]|%u", &loc, Port) == 2) {
-     cString addr(loc, true);
-     *Protocol = eProtocolUDP;
-     return addr;
-     }
-  else if (sscanf(Param, "IPTV|HTTP|%a[^|]|%u", &loc, Port) == 2) {
-     cString addr(loc, true);
-     *Protocol = eProtocolHTTP;
-     return addr;
-     }
-  else if (sscanf(Param, "IPTV|FILE|%a[^|]|%u", &loc, Port) == 2) {
-     cString addr(loc, true);
-     *Protocol = eProtocolFILE;
-     return addr;
-     }
-  return NULL;
-}
-
-void cIptvMenuEditChannel::GetChannelData(cChannel *Channel)
-{
-  if (Channel) {
-     int port, protocol;
-     data.frequency = Channel->Frequency();
-     data.source = Channel->Source();
-     data.vpid = Channel->Vpid();
-     data.ppid = Channel->Ppid();
-     data.tpid = Channel->Tpid();
-     for (unsigned int i = 0; i < sizeof(data.apid); ++i)
-         data.apid[i] = Channel->Apid(i);
-     for (unsigned int i = 0; i < sizeof(data.dpid); ++i)
-         data.dpid[i] = Channel->Dpid(i);
-     for (unsigned int i = 0; i < sizeof(data.spid); ++i)
-         data.spid[i] = Channel->Spid(i);
-     for (unsigned int i = 0; i < sizeof(data.caids); ++i)
-         data.caids[i] = Channel->Ca(i);
-     data.sid = Channel->Sid();
-     data.nid = Channel->Nid();
-     data.tid = Channel->Tid();
-     data.rid = Channel->Rid();
-     strn0cpy(data.name, Channel->Name(), sizeof(data.name));
-     strn0cpy(data.location, *GetIptvSettings(Channel->PluginParam(), &port, &protocol), sizeof(data.location));
-     data.protocol = protocol;
-     data.port = port;
-     }
-  else {
-     data.frequency = 1;
-     data.source = cSource::FromData(cSource::stPlug);
-     data.vpid = 0;
-     data.ppid = 0;
-     data.tpid = 0;
-     for (unsigned int i = 0; i < sizeof(data.apid); ++i)
-         data.apid[i] = 0;
-     for (unsigned int i = 0; i < sizeof(data.dpid); ++i)
-         data.dpid[i] = 0;
-     for (unsigned int i = 0; i < sizeof(data.spid); ++i)
-         data.spid[i] = 0;
-     for (unsigned int i = 0; i < sizeof(data.caids); ++i)
-         data.caids[i] = 0;
-     data.sid = 1;
-     data.nid = 0;
-     data.tid = 0;
-     data.rid = 0;
-     strn0cpy(data.name, "IPTV", sizeof(data.name));
-     strn0cpy(data.location, "127.0.0.1", sizeof(data.location));
-     data.protocol = eProtocolUDP;
-     data.port = 1234;
-     }
-}
-
-void cIptvMenuEditChannel::SetChannelData(cChannel *Channel)
-{
-  if (Channel) {
-     cString param;
-     char alangs[MAXAPIDS][MAXLANGCODE2] = { "" };
-     char dlangs[MAXDPIDS][MAXLANGCODE2] = { "" };
-     char slangs[MAXSPIDS][MAXLANGCODE2] = { "" };
-     switch (data.protocol) {
-       case eProtocolFILE:
-            param = cString::sprintf("IPTV|FILE|%s|%d", data.location, data.port);
-            break;
-       case eProtocolHTTP:
-            param = cString::sprintf("IPTV|HTTP|%s|%d", data.location, data.port);
-            break;
-       default:
-       case eProtocolUDP:
-            param = cString::sprintf("IPTV|UDP|%s|%d", data.location, data.port);
-            break;
-       }
-     Channel->SetPids(data.vpid, data.ppid, data.apid, alangs, data.dpid, dlangs, data.spid, slangs, data.tpid);
-     Channel->SetCaIds(data.caids);
-     Channel->SetId(data.nid, data.tid, data.sid, data.rid);
-     Channel->SetName(data.name, "", "IPTV");
-     Channel->SetPlugTransponderData(cSource::stPlug, data.frequency, param);
-     }
-}
-
-void cIptvMenuEditChannel::Setup(void)
-{
-  int current = Current();
-  Clear();
-  // IPTV specific settings
-  Add(new cMenuEditStraItem(tr("Protocol"),    &data.protocol, 3, protocols));
-  switch (data.protocol) {
-    case eProtocolFILE:
-         Add(new cMenuEditStrItem(trVDR("File"),     data.location, sizeof(data.location), trVDR(FileNameChars)));
-         Add(new cMenuEditIntItem(tr("Delay (ms)"), &data.port,  0, 0xFFFF));
-         break;
-    case eProtocolHTTP:
-    case eProtocolUDP:
-    default:
-         Add(new cMenuEditStrItem(tr("Address"), data.location, sizeof(data.location), trVDR(FileNameChars)));
-         Add(new cMenuEditIntItem(tr("Port"),   &data.port,  0, 0xFFFF));
-         break;
-    }
-  // Normal settings
-  Add(new cMenuEditStrItem(trVDR("Name"),       data.name,     sizeof(data.name), trVDR(FileNameChars)));
-  Add(new cMenuEditIntItem(trVDR("Frequency"), &data.frequency));
-  Add(new cMenuEditIntItem(trVDR("Vpid"),      &data.vpid,     0, 0x1FFF));
-  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));
-  Add(new cMenuEditIntItem(trVDR("Spid1"),     &data.spid[0],  0, 0x1FFF));
-  Add(new cMenuEditIntItem(trVDR("Spid2"),     &data.spid[1],  0, 0x1FFF));
-  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));
-  Add(new cMenuEditIntItem(tr   ("Nid"),       &data.nid,      0, 0xFFFF));
-  Add(new cMenuEditIntItem(tr   ("Tid"),       &data.tid,      0, 0xFFFF));
-  Add(new cMenuEditIntItem(tr   ("Rid"),       &data.rid,      0, 0x1FFF));
-  SetCurrent(Get(current));
-  Display();
-}
-
-eOSState cIptvMenuEditChannel::ProcessKey(eKeys Key)
-{
-  int oldProtocol = data.protocol;
-  eOSState state = cOsdMenu::ProcessKey(Key);
-  if (state == osUnknown) {
-     if (Key == kOk) {
-        cChannel newchannel;
-        SetChannelData(&newchannel);
-        bool uniquityFailed = false;
-        bool firstIncrement = true;
-        // Search for identical channels as these will be ignored by vdr
-        for (cChannel *iteratorChannel = Channels.First(); iteratorChannel;
-             iteratorChannel = Channels.Next(iteratorChannel)) {
-           // This is one of the channels cause the uniquity check to fail
-           if (!iteratorChannel->GroupSep() && iteratorChannel != channel
-               && iteratorChannel->GetChannelID() == newchannel.GetChannelID()) {
-              // See if it has unique Plugin param. If yes then increment
-              // the corresponding Rid until it is unique
-              if (strcmp(iteratorChannel->PluginParam(),
-                         newchannel.PluginParam())) {
-                 // If the channel RID is already at maximum, then fail the
-                 // channel modification
-                 if (iteratorChannel->Rid() >= 0x1FFF) {
-                    debug("Cannot increment RID over maximum value\n");
-                    uniquityFailed = true;
-                    break;
-                    }
-                 debug("Incrementing conflicting channel RID\n");
-                 iteratorChannel->SetId(iteratorChannel->Nid(),
-                                        iteratorChannel->Tid(),
-                                        iteratorChannel->Sid(),
-                                        firstIncrement ?
-                                        0 : iteratorChannel->Rid() + 1);
-
-                 // Try zero Rid:s at first increment. Prevents them from
-                 // creeping slowly towards their maximum value
-                 firstIncrement = false;
-
-                 // Re-set the search and start again
-                 iteratorChannel = Channels.First();
-                 continue;
-                 // Cannot work around by incrementing rid because channels
-                 // are actually copies of each other
-                 }
-              else {
-                 uniquityFailed = true;
-                 break;
-                 }
-              }
-           }
-        if (!uniquityFailed) {
-           if (channel) {
-              SetChannelData(channel);
-              isyslog("edited channel %d %s", channel->Number(), *channel->ToText());
-              state = osBack;
-              }
-           else {
-              channel = new cChannel;
-              SetChannelData(channel);
-              Channels.Add(channel);
-              Channels.ReNumber();
-              isyslog("added channel %d %s", channel->Number(), *channel->ToText());
-              state = osUser1;
-              }
-           Channels.SetModified(true);
-           }     
-        else {
-           Skins.Message(mtError, tr("Cannot find unique channel settings!"));
-           state = osContinue;
-           }
-        }
-     }
-  if ((Key != kNone) && (data.protocol != oldProtocol)) {
-     switch (data.protocol) {
-       case eProtocolFILE:
-            strn0cpy(data.location, "/tmp/video.ts", sizeof(data.location));
-            data.port = 0;
-            break;
-       case eProtocolHTTP:
-            strn0cpy(data.location, "127.0.0.1/TS/1", sizeof(data.location));
-            data.port = 3000;
-            break;
-       default:
-       case eProtocolUDP:
-            strn0cpy(data.location, "127.0.0.1", sizeof(data.location));
-            data.port = 1234;
-            break;
-       }
-     Setup();
-     }
-  return state;
-}
-
-// --- cIptvMenuChannelItem --------------------------------------------------
-
-class cIptvMenuChannelItem : public cOsdItem
-{
-private:
-  cChannel *channel;
-
-public:
-  cIptvMenuChannelItem(cChannel *Channel);
-  virtual void Set(void);
-  cChannel *Channel(void) { return channel; }
-};
-
-cIptvMenuChannelItem::cIptvMenuChannelItem(cChannel *Channel)
-{
-  channel = Channel;
-  Set();
-}
-
-void cIptvMenuChannelItem::Set(void)
-{
-  char *buffer = NULL;
-  asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
-  SetText(buffer, false);
-}
-
-// --- cIptvMenuChannels -----------------------------------------------------
-
-class cIptvMenuChannels : public cOsdMenu
-{
-private:
-  void Setup(void);
-  cChannel *GetChannel(int Index);
-  void Propagate(void);
-
-protected:
-  eOSState Edit(void);
-  eOSState New(void);
-  eOSState Delete(void);
-  eOSState Switch(void);
-
-public:
-  cIptvMenuChannels();
-  ~cIptvMenuChannels();
-  virtual eOSState ProcessKey(eKeys Key);
-};
-
-cIptvMenuChannels::cIptvMenuChannels(void)
-:cOsdMenu(tr("IPTV Channels"), numdigits(Channels.MaxNumber()) + 1)
-{
-  Setup();
-  Channels.IncBeingEdited();
-}
-
-cIptvMenuChannels::~cIptvMenuChannels()
-{
-  Channels.DecBeingEdited();
-}
-
-void cIptvMenuChannels::Setup(void)
-{
-  Clear();
-  for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-      if (!channel->GroupSep() && channel->IsPlug() && !strncmp(channel->PluginParam(), "IPTV", 4)) {
-         cIptvMenuChannelItem *item = new cIptvMenuChannelItem(channel);
-         Add(item);
-         }
-      }
-  SetHelp(trVDR("Button$Edit"), trVDR("Button$New"), trVDR("Button$Delete"), NULL);
-  Display();
-}
-
-cChannel *cIptvMenuChannels::GetChannel(int Index)
-{
-  cIptvMenuChannelItem *p = (cIptvMenuChannelItem *)Get(Index);
-  return p ? (cChannel *)p->Channel() : NULL;
-}
-
-void cIptvMenuChannels::Propagate(void)
-{
-  Channels.ReNumber();
-  for (cIptvMenuChannelItem *ci = (cIptvMenuChannelItem *)First(); ci; ci = (cIptvMenuChannelItem *)ci->Next())
-      ci->Set();
-  Display();
-  Channels.SetModified(true);
-}
-
-eOSState cIptvMenuChannels::Switch(void)
-{
-  if (HasSubMenu() || Count() == 0)
-     return osContinue;
-  cChannel *ch = GetChannel(Current());
-  if (ch)
-     return cDevice::PrimaryDevice()->SwitchChannel(ch, true) ? osEnd : osContinue;
-  return osEnd;
-}
-
-eOSState cIptvMenuChannels::Edit(void)
-{
-  if (HasSubMenu() || Count() == 0)
-     return osContinue;
-  cChannel *ch = GetChannel(Current());
-  if (ch)
-     return AddSubMenu(new cIptvMenuEditChannel(ch));
-  return osContinue;
-}
-
-eOSState cIptvMenuChannels::New(void)
-{
-  if (HasSubMenu())
-     return osContinue;
-  return AddSubMenu(new cIptvMenuEditChannel(GetChannel(Current()), true));
-}
-
-eOSState cIptvMenuChannels::Delete(void)
-{
-  if (!HasSubMenu() && Count() > 0) {
-     int CurrentChannelNr = cDevice::CurrentChannel();
-     cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
-     int Index = Current();
-     cChannel *channel = GetChannel(Current());
-     int DeletedChannel = channel->Number();
-     // Check if there is a timer using this channel:
-     if (channel->HasTimer()) {
-        Skins.Message(mtError, trVDR("Channel is being used by a timer!"));
-        return osContinue;
-        }
-     if (Interface->Confirm(trVDR("Delete channel?"))) {
-        if (CurrentChannel && channel == CurrentChannel) {
-           int n = Channels.GetNextNormal(CurrentChannel->Index());
-           if (n < 0)
-              n = Channels.GetPrevNormal(CurrentChannel->Index());
-           CurrentChannel = Channels.Get(n);
-           CurrentChannelNr = 0; // triggers channel switch below
-           }
-        Channels.Del(channel);
-        cOsdMenu::Del(Index);
-        Propagate();
-        isyslog("channel %d deleted", DeletedChannel);
-        if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
-           if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
-              Channels.SwitchTo(CurrentChannel->Number());
-           else
-              cDevice::SetCurrentChannel(CurrentChannel);
-           }
-        }
-     }
-  return osContinue;
-}
-
-eOSState cIptvMenuChannels::ProcessKey(eKeys Key)
-{
-  eOSState state = cOsdMenu::ProcessKey(Key);
-
-  switch (state) {
-    case osUser1: {
-         cChannel *channel = Channels.Last();
-         if (channel) {
-            Add(new cIptvMenuChannelItem(channel), true);
-            return CloseSubMenu();
-            }
-         }
-         break;
-    default:
-         if (state == osUnknown) {
-            switch (Key) {
-              case kOk:     return Switch();
-              case kRed:    return Edit();
-              case kGreen:  return New();
-              case kYellow: return Delete();
-              default: break;
-              }
-            }
-    }
-  return state;
-}
-
 // --- cIptvMenuInfo ---------------------------------------------------------
 
 class cIptvMenuInfo : public cOsdMenu
@@ -495,8 +34,9 @@ public:
 };
 
 cIptvMenuInfo::cIptvMenuInfo()
-:cOsdMenu(tr("IPTV Information")), text(""), timeout(INFO_TIMEOUT_MS), page(IPTV_DEVICE_INFO_GENERAL)
+:cOsdMenu(tr("IPTV Information")), text(""), timeout(), page(IPTV_DEVICE_INFO_GENERAL)
 {
+  timeout.Set(INFO_TIMEOUT_MS);
   UpdateInfo();
   SetHelp(tr("General"), tr("Pids"), tr("Filters"), tr("Bits/bytes"));
 }
@@ -520,7 +60,7 @@ void cIptvMenuInfo::Display(void)
 {
   cOsdMenu::Display();
   DisplayMenu()->SetText(text, true);
-  if (text)
+  if (*text)
      cStatus::MsgOsdTextItem(text);
 }
 
@@ -555,7 +95,7 @@ eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
        case kYellow: page = IPTV_DEVICE_INFO_FILTERS;
                      UpdateInfo();
                      break;
-       case kBlue:   IptvConfig.SetUseBytes(!IptvConfig.GetUseBytes());
+       case kBlue:   IptvConfig.SetUseBytes(IptvConfig.GetUseBytes() ? 0 : 1);
                      UpdateInfo();
                      break;
        default:      if (timeout.TimedOut())
@@ -574,8 +114,8 @@ cIptvPluginSetup::cIptvPluginSetup()
   debug("cIptvPluginSetup::cIptvPluginSetup()\n");
   tsBufferSize = IptvConfig.GetTsBufferSize();
   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;
@@ -584,36 +124,43 @@ cIptvPluginSetup::cIptvPluginSetup()
       disabledFilterNames[i] = tr(section_filter_table[i].description);
       }
   Setup();
-  SetHelp(trVDR("Channels"), NULL, NULL, trVDR("Button$Info"));
+  SetHelp(NULL, NULL, NULL, trVDR("Button$Info"));
 }
 
 void cIptvPluginSetup::Setup(void)
 {
   int current = Current();
+
   Clear();
-  Add(new cMenuEditIntItem( tr("TS buffer size [MB]"),         &tsBufferSize, 1, 4));
+  help.Clear();
+
+  Add(new cMenuEditIntItem( tr("TS buffer size [MB]"), &tsBufferSize, 1, 4));
+  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."));
+
   Add(new cMenuEditIntItem( tr("TS buffer prefill ratio [%]"), &tsBufferPrefill, 0, 40));
-  Add(new cMenuEditBoolItem(tr("Use section filtering"),       &sectionFiltering));
+  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."));
+
+  Add(new cMenuEditIntItem( tr("EXT protocol base port"), &extProtocolBasePort, 0, 0xFFF7));
+  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."));
+
+  Add(new cMenuEditBoolItem(tr("Use section filtering"), &sectionFiltering));
+  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."));
+
   if (sectionFiltering) {
-     Add(new cMenuEditBoolItem(tr("Scan Sid automatically"),   &sidScanning));
+     Add(new cMenuEditIntItem( tr("Disable filters"), &numDisabledFilters, 0, SECTION_FILTER_TABLE_SIZE));
-     Add(new cMenuEditIntItem( tr("Disable filters"),          &numDisabledFilters, 0, SECTION_FILTER_TABLE_SIZE));
+     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."));
+
      for (int i = 0; i < numDisabledFilters; ++i) {
          // TRANSLATORS: note the singular!
-         Add(new cMenuEditStraItem(tr("Disable filter"),       &disabledFilterIndexes[i], SECTION_FILTER_TABLE_SIZE, disabledFilterNames));
+         Add(new cMenuEditStraItem(tr("Disable filter"), &disabledFilterIndexes[i], SECTION_FILTER_TABLE_SIZE, disabledFilterNames));
+         help.Append(tr("Define an ill-behaving filter to be blacklisted."));
          }
      }
+
   SetCurrent(Get(current));
   Display();
 }
 
-eOSState cIptvPluginSetup::EditChannel(void)
-{
-  debug("cIptvPluginSetup::EditChannel()\n");
-  if (HasSubMenu())
-     return osContinue;
-  return AddSubMenu(new cIptvMenuChannels());
-}
-
 eOSState cIptvPluginSetup::ShowInfo(void)
 {
   debug("cIptvPluginSetup::ShowInfo()\n");
@@ -627,18 +174,22 @@ eOSState cIptvPluginSetup::ProcessKey(eKeys Key)
   int oldsectionFiltering = sectionFiltering;
   int oldNumDisabledFilters = numDisabledFilters;
   eOSState state = cMenuSetupPage::ProcessKey(Key);
+
   if (state == osUnknown) {
      switch (Key) {
-       case kRed:  return EditChannel();
        case kBlue: return ShowInfo();
-       default:    state = osContinue;
+       case kInfo: if (Current() < help.Size())
+                      return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), help[Current()]));
+       default:    state = osContinue; break;
        }
      }
+
   if ((Key != kNone) && ((numDisabledFilters != oldNumDisabledFilters) || (sectionFiltering != oldsectionFiltering))) {
      while ((numDisabledFilters < oldNumDisabledFilters) && (oldNumDisabledFilters > 0))
            disabledFilterIndexes[--oldNumDisabledFilters] = -1;
      Setup();
      }
+
   return state;
 }
 
@@ -666,14 +217,14 @@ void cIptvPluginSetup::Store(void)
   // Store values into setup.conf
   SetupStore("TsBufferSize", tsBufferSize);
   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,29 +3,75 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.h,v 1.15 2007/10/09 16:37:16 rahrenbe Exp $
  */
 
 #ifndef __IPTV_SETUP_H
 #define __IPTV_SETUP_H
 
 #include <vdr/menuitems.h>
+#include <vdr/sourceparams.h>
 #include "common.h"
 
+class cIptvTransponderParameters
+{
+  friend class cIptvSourceParam;
+private:
+  int sidscan;
+  int pidscan;
+  int protocol;
+  char address[MaxFileName];
+  int parameter;
+public:
+  cIptvTransponderParameters(const char *Parameters = NULL);
+  int SidScan(void) const { return sidscan; }
+  int PidScan(void) const { return pidscan; }
+  int Protocol(void) const { return protocol; }
+  const char *Address(void) const { return address; }
+  int Parameter(void) const { return parameter; }
+  void SetSidScan(int SidScan) { sidscan = SidScan; }
+  void SetPidScan(int PidScan) { pidscan = PidScan; }
+  void SetProtocol(int Protocol) { protocol = Protocol; }
+  void SetAddress(const char *Address) { strncpy(address, Address, sizeof(address)); }
+  void SetParameter(int Parameter) { parameter = Parameter; }
+  cString ToString(char Type) const;
+  bool Parse(const char *s);
+};
+
+class cIptvSourceParam : public cSourceParam
+{
+private:
+  enum {
+    eProtocolUDP,
+    eProtocolHTTP,
+    eProtocolFILE,
+    eProtocolEXT,
+    eProtocolCount
+  };
+  int param;
+  cChannel data;
+  cIptvTransponderParameters itp;
+  const char *protocols[eProtocolCount];
+public:
+  cIptvSourceParam(char Source, const char *Description);
+  virtual void SetData(cChannel *Channel);
+  virtual void GetData(cChannel *Channel);
+  virtual cOsdItem *GetOsdItem(void);
+};
+
 class cIptvPluginSetup : public cMenuSetupPage
 {
 private:
   int tsBufferSize;
   int tsBufferPrefill;
+  int extProtocolBasePort;
   int sectionFiltering;
-  int sidScanning;
   int numDisabledFilters;
   int disabledFilterIndexes[SECTION_FILTER_TABLE_SIZE];
   const char *disabledFilterNames[SECTION_FILTER_TABLE_SIZE];
+  cVector<const char*> help;
 
-  eOSState EditChannel(void);
   eOSState ShowInfo(void);
-  virtual void Setup(void);
+  void Setup(void);
   void StoreFilters(const char *Name, int *Values);
 
 protected:

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>
@@ -27,7 +26,7 @@ void cSidScanner::SetStatus(bool On)
 void cSidScanner::SetChannel(const cChannel *Channel)
 {
   if (Channel) {
-     debug("cSidScanner::SetChannel(): %s\n", Channel->PluginParam());
+     debug("cSidScanner::SetChannel(): %s\n", Channel->Parameters());
      channel = *Channel;
      }
   else {
@@ -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
@@ -18,11 +17,13 @@ private:
 
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
+  virtual void SetStatus(bool On);
 
 public:
   cSidScanner(void);
-  virtual void SetStatus(bool On);
   void SetChannel(const cChannel *Channel);
+  void Open() { SetStatus(true); }
+  void Close() { SetStatus(false); }
 };
 
 #endif // __SIDSCANNER_H

socket.c

@@ -0,0 +1,180 @@
+/*
+ * socket.c: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <vdr/device.h>
+
+#include "common.h"
+#include "config.h"
+#include "socket.h"
+
+cIptvSocket::cIptvSocket()
+: socketPort(0),
+  socketDesc(-1),
+  isActive(false)
+{
+  debug("cIptvSocket::cIptvSocket()\n");
+}
+
+cIptvSocket::~cIptvSocket()
+{
+  debug("cIptvSocket::~cIptvSocket()\n");
+  // Close the socket
+  CloseSocket();
+}
+
+bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
+{
+  debug("cIptvSocket::OpenSocket()\n");
+  // If socket is there already and it is bound to a different port, it must
+  // be closed first
+  if (Port != socketPort) {
+     debug("cIptvSocket::OpenSocket(): Socket tear-down\n");
+     CloseSocket();
+     }
+  // Bind to the socket if it is not active already
+  if (socketDesc < 0) {
+     int yes = 1;
+     // Create socket
+     if (isUdp)
+        socketDesc = socket(PF_INET, SOCK_DGRAM, 0);
+     else
+        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);
+     // Allow multiple sockets to use the same PORT number
+     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0, "setsockopt()",
+                   CloseSocket(), return false);
+     // Bind socket
+     memset(&sockAddr, '\0', sizeof(sockAddr));
+     sockAddr.sin_family = AF_INET;
+     sockAddr.sin_port = htons((uint16_t)(Port & 0xFFFF));
+     sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+     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;
+     }
+  return true;
+}
+
+void cIptvSocket::CloseSocket(void)
+{
+  debug("cIptvSocket::CloseSocket()\n");
+  // Check if socket exists
+  if (socketDesc >= 0) {
+     close(socketDesc);
+     socketDesc = -1;
+     }
+}
+
+// UDP socket class
+cIptvUdpSocket::cIptvUdpSocket()
+{
+  debug("cIptvUdpSocket::cIptvUdpSocket()\n");
+}
+
+cIptvUdpSocket::~cIptvUdpSocket()
+{
+  debug("cIptvUdpSocket::~cIptvUdpSocket()\n");
+}
+
+bool cIptvUdpSocket::OpenSocket(const int Port)
+{
+  debug("cIptvUdpSocket::OpenSocket()\n");
+  return cIptvSocket::OpenSocket(Port, true);
+}
+
+int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+{
+  //debug("cIptvUdpSocket::Read()\n");
+  // Error out if socket not initialized
+  if (socketDesc <= 0) {
+     error("Invalid socket in %s\n", __FUNCTION__);
+     return -1;
+     }
+  socklen_t addrlen = sizeof(sockAddr);
+  int len = 0;
+  // Read data from socket
+  if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
+     len = (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+                    (struct sockaddr *)&sockAddr, &addrlen);
+  if ((len > 0) && (BufferAddr[0] == TS_SYNC_BYTE)) {
+     return len;
+     }
+  else if (len > 3) {
+     // http://www.networksorcery.com/enp/rfc/rfc2250.txt
+     // version
+     unsigned int v = (BufferAddr[0] >> 6) & 0x03;
+     // extension bit
+     unsigned int x = (BufferAddr[0] >> 4) & 0x01;
+     // cscr count
+     unsigned int cc = BufferAddr[0] & 0x0F;
+     // payload type: MPEG2 TS = 33
+     //unsigned int pt = readBuffer[1] & 0x7F;
+     // header lenght
+     unsigned int headerlen = (3 + cc) * (unsigned int)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) * (unsigned int)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) &&
+         (BufferAddr[headerlen] == TS_SYNC_BYTE)) {
+        // Set argument point to payload in read buffer
+        memmove(BufferAddr, &BufferAddr[headerlen], (len - headerlen));
+        return (len - headerlen);
+        }
+     }
+  return 0;
+}
+
+// TCP socket class
+cIptvTcpSocket::cIptvTcpSocket()
+{
+  debug("cIptvTcpSocket::cIptvTcpSocket()\n");
+}
+
+cIptvTcpSocket::~cIptvTcpSocket()
+{
+  debug("cIptvTcpSocket::~cIptvTcpSocket()\n");
+}
+
+bool cIptvTcpSocket::OpenSocket(const int Port)
+{
+  debug("cIptvTcpSocket::OpenSocket()\n");
+  return cIptvSocket::OpenSocket(Port, false);
+}
+
+int cIptvTcpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
+{
+  //debug("cIptvTcpSocket::Read()\n");
+  // Error out if socket not initialized
+  if (socketDesc <= 0) {
+     error("Invalid socket in %s\n", __FUNCTION__);
+     return -1;
+     }
+  socklen_t addrlen = sizeof(sockAddr);
+  // Read data from socket
+  if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
+     return (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+                     (struct sockaddr *)&sockAddr, &addrlen);
+  return 0;
+}

socket.h

@@ -0,0 +1,46 @@
+/*
+ * protocoludp.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __IPTV_SOCKET_H
+#define __IPTV_SOCKET_H
+
+#include <arpa/inet.h>
+
+class cIptvSocket {
+protected:
+  int socketPort;
+  int socketDesc;
+  struct sockaddr_in sockAddr;
+  bool isActive;
+
+protected:
+  bool OpenSocket(const int Port, const bool isUdp);
+  void CloseSocket(void);
+
+public:
+  cIptvSocket();
+  virtual ~cIptvSocket();
+};
+
+class cIptvUdpSocket : public cIptvSocket {
+public:
+  cIptvUdpSocket();
+  virtual ~cIptvUdpSocket();
+  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
+  bool OpenSocket(const int Port);
+};
+
+class cIptvTcpSocket : public cIptvSocket {
+public:
+  cIptvTcpSocket();
+  virtual ~cIptvTcpSocket();
+  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
+  bool OpenSocket(const int Port);
+};
+
+#endif // __IPTV_SOCKET_H
+

source.c

@@ -0,0 +1,174 @@
+/*
+ * source.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 "source.h"
+
+// --- cIptvTransponderParameters --------------------------------------------
+
+cIptvTransponderParameters::cIptvTransponderParameters(const char *Parameters)
+: sidscan(0),
+  pidscan(0),
+  protocol(eProtocolUDP),
+  parameter(0)
+{
+  debug("cIptvTransponderParameters::cIptvTransponderParameters(): Parameters=%s\n", Parameters);
+
+  memset(&address, 0, sizeof(address));
+  Parse(Parameters);
+}
+
+cString cIptvTransponderParameters::ToString(char Type) const
+{
+  debug("cIptvTransponderParameters::ToString() Type=%c\n", Type);
+
+  const char *protocolstr;
+
+  switch (protocol) {
+    case eProtocolEXT:
+         protocolstr = "EXT";
+         break;
+    case eProtocolHTTP:
+         protocolstr = "HTTP";
+         break;
+    case eProtocolFILE:
+         protocolstr = "FILE";
+         break;
+    default:
+    case eProtocolUDP:
+         protocolstr = "UDP";
+         break;
+  }
+  return cString::sprintf("S=%d|P=%d|F=%s|U=%s|A=%d", sidscan, pidscan, protocolstr, address, parameter);
+}
+
+bool cIptvTransponderParameters::Parse(const char *s)
+{
+  debug("cIptvTransponderParameters::Parse(): s=%s\n", s);
+  bool result = false;
+
+  if (s && *s) {
+     const char *delim = "|";
+     char *str = strdup(s);
+     char *saveptr = NULL;
+     char *token = NULL;
+     bool found_s = false;
+     bool found_p = false;
+     bool found_f = false;
+     bool found_u = false;
+     bool found_a = false;
+
+     while ((token = strtok_r(str, delim, &saveptr)) != NULL) {
+       char *data = token;
+       ++data;
+       if (data && (*data == '=')) {
+          ++data;
+          switch (*token) {
+            case 'S':
+                 sidscan = (int)strtol(data, (char **)NULL, 10);
+                 found_s = true;
+                 break;
+            case 'P':
+                 pidscan = (int)strtol(data, (char **)NULL, 10);
+                 found_p = true;
+                 break;
+            case 'F':
+                 if (strstr(data, "UDP")) {
+                    protocol = eProtocolUDP;
+                    found_f = true;
+                    }
+                 else if (strstr(data, "HTTP")) {
+                    protocol = eProtocolHTTP;
+                    found_f = true;
+                    }
+                 else if (strstr(data, "FILE")) {
+                    protocol = eProtocolFILE;
+                    found_f = true;
+                    }
+                 else if (strstr(data, "EXT")) {
+                    protocol = eProtocolEXT;
+                    found_f = true;
+                    }
+                 break;
+            case 'U':
+                 strn0cpy(address, data, sizeof(address));
+                 found_u = true;
+                 break;
+            case 'A':
+                 parameter = (int)strtol(data, (char **)NULL, 10);
+                 found_a = true;
+                 break;
+            default:
+                 break;
+            }
+          }
+       str = NULL;
+       }
+
+     if (found_s && found_p && found_f && found_u && found_a)
+        result = true;
+     else
+        error("Invalid channel parameters: %s\n", str);
+
+     free(str);
+     }
+
+  return (result);
+}
+
+// --- cIptvSourceParam ------------------------------------------------------
+
+cIptvSourceParam::cIptvSourceParam(char Source, const char *Description)
+  : cSourceParam(Source, Description),
+    param(0),
+    nid(0),
+    tid(0),
+    rid(0)
+{
+  debug("cIptvSourceParam::cIptvSourceParam(): Source=%c Description=%s\n", Source, Description);
+
+  protocols[cIptvTransponderParameters::eProtocolUDP]  = tr("UDP");
+  protocols[cIptvTransponderParameters::eProtocolHTTP] = tr("HTTP");
+  protocols[cIptvTransponderParameters::eProtocolFILE] = tr("FILE");
+  protocols[cIptvTransponderParameters::eProtocolEXT]  = tr("EXT");
+}
+
+void cIptvSourceParam::SetData(cChannel *Channel)
+{
+  debug("cIptvSourceParam::SetData(): Channel=%s)\n", Channel->Parameters());
+  data = *Channel;
+  nid = data.Nid();
+  tid = data.Tid();
+  rid = data.Rid();
+  itp.Parse(data.Parameters());
+  param = 0;
+}
+
+void cIptvSourceParam::GetData(cChannel *Channel)
+{
+  debug("cIptvSourceParam::GetData(): Channel=%s\n", Channel->Parameters());
+  data.SetTransponderData(Channel->Source(), Channel->Frequency(), data.Srate(), itp.ToString(Source()), true);
+  data.SetId(nid, tid, Channel->Sid(), rid);
+  *Channel = data;
+}
+
+cOsdItem *cIptvSourceParam::GetOsdItem(void)
+{
+  debug("cIptvSourceParam::GetOsdItem()\n");
+  switch (param++) {
+    case  0: return new cMenuEditIntItem( tr("Nid"),       &nid,      0);
+    case  1: return new cMenuEditIntItem( tr("Tid"),       &tid,      0);
+    case  2: return new cMenuEditIntItem( tr("Rid"),       &rid,      0);
+    case  3: return new cMenuEditBoolItem(tr("Scan sid"),  &itp.sidscan);
+    case  4: return new cMenuEditBoolItem(tr("Scan pids"), &itp.pidscan);
+    case  5: return new cMenuEditStraItem(tr("Protocol"),  &itp.protocol,  ELEMENTS(protocols), protocols);
+    case  6: return new cMenuEditStrItem( tr("Address"),    itp.address,   sizeof(itp.address));
+    case  7: return new cMenuEditIntItem( tr("Parameter"), &itp.parameter, 0,                   0xFFFF);
+    default: return NULL;
+    }
+  return NULL;
+}

source.h

@@ -0,0 +1,67 @@
+/*
+ * source.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __IPTV_SOURCE_H
+#define __IPTV_SOURCE_H
+
+#include <vdr/menuitems.h>
+#include <vdr/sourceparams.h>
+#include "common.h"
+
+class cIptvTransponderParameters
+{
+  friend class cIptvSourceParam;
+
+private:
+  int sidscan;
+  int pidscan;
+  int protocol;
+  char address[MaxFileName];
+  int parameter;
+
+public:
+  enum {
+    eProtocolUDP,
+    eProtocolHTTP,
+    eProtocolFILE,
+    eProtocolEXT,
+    eProtocolCount
+  };
+  cIptvTransponderParameters(const char *Parameters = NULL);
+  int SidScan(void) const { return sidscan; }
+  int PidScan(void) const { return pidscan; }
+  int Protocol(void) const { return protocol; }
+  const char *Address(void) const { return address; }
+  int Parameter(void) const { return parameter; }
+  void SetSidScan(int SidScan) { sidscan = SidScan; }
+  void SetPidScan(int PidScan) { pidscan = PidScan; }
+  void SetProtocol(int Protocol) { protocol = Protocol; }
+  void SetAddress(const char *Address) { strncpy(address, Address, sizeof(address)); }
+  void SetParameter(int Parameter) { parameter = Parameter; }
+  cString ToString(char Type) const;
+  bool Parse(const char *s);
+};
+
+class cIptvSourceParam : public cSourceParam
+{
+private:
+  int param;
+  int nid;
+  int tid;
+  int rid;
+  cChannel data;
+  cIptvTransponderParameters itp;
+  const char *protocols[cIptvTransponderParameters::eProtocolCount];
+
+public:
+  cIptvSourceParam(char Source, const char *Description);
+  virtual void SetData(cChannel *Channel);
+  virtual void GetData(cChannel *Channel);
+  virtual cOsdItem *GetOsdItem(void);
+};
+
+#endif // __IPTV_SOURCE_H

statisticif.h

@@ -1,25 +0,0 @@
-/*
- * statisticif.h: IPTV plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: statisticif.h,v 1.4 2007/10/07 19:06:33 ajhseppa Exp $
- */
-
-#ifndef __IPTV_STATISTICIF_H
-#define __IPTV_STATISTICIF_H
-
-#include <vdr/tools.h>
-
-class cIptvStatisticIf {
-public:
-  cIptvStatisticIf() {}
-  virtual ~cIptvStatisticIf() {}
-  virtual cString GetStatistic() = 0;
-
-private:
-    cIptvStatisticIf(const cIptvStatisticIf&);
-    cIptvStatisticIf& operator=(const cIptvStatisticIf&);
-};
-
-#endif // __IPTV_STATISTICIF_H

statistics.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: statistics.c,v 1.20 2007/10/11 23:06:49 rahrenbe Exp $
  */
 
 #include <limits.h>
@@ -27,13 +26,13 @@ cIptvSectionStatistics::~cIptvSectionStatistics()
   //debug("cIptvSectionStatistics::~cIptvSectionStatistics()\n");
 }
 
-cString cIptvSectionStatistics::GetStatistic()
+cString cIptvSectionStatistics::GetSectionStatistic()
 {
   //debug("cIptvSectionStatistics::GetStatistic()\n");
   cMutexLock MutexLock(&mutex);
   uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
   timer.Set();
-  long bitrate = elapsed ? (long)((float)1000 / KILOBYTE(1) * filteredData / elapsed) : 0L;
+  long bitrate = elapsed ? (long)(1000.0L * filteredData / KILOBYTE(1) / elapsed) : 0L;
   if (!IptvConfig.GetUseBytes())
      bitrate *= 8;
   // no trailing linefeed here!
@@ -43,7 +42,7 @@ cString cIptvSectionStatistics::GetStatistic()
   return info;
 }
 
-void cIptvSectionStatistics::AddStatistic(long Bytes, long Calls)
+void cIptvSectionStatistics::AddSectionStatistic(long Bytes, long Calls)
 {
   //debug("cIptvSectionStatistics::AddStatistic(Bytes=%ld, Calls=%ld)\n", Bytes, Calls); 
   cMutexLock MutexLock(&mutex);
@@ -67,7 +66,7 @@ cIptvPidStatistics::~cIptvPidStatistics()
   debug("cIptvPidStatistics::~cIptvPidStatistics()\n");
 }
 
-cString cIptvPidStatistics::GetStatistic()
+cString cIptvPidStatistics::GetPidStatistic()
 {
   //debug("cIptvPidStatistics::GetStatistic()\n");
   cMutexLock MutexLock(&mutex);
@@ -76,7 +75,7 @@ cString cIptvPidStatistics::GetStatistic()
   cString info("Active pids:\n");
   for (unsigned int i = 0; i < IPTV_STATS_ACTIVE_PIDS_COUNT; ++i) {
       if (mostActivePids[i].pid) {
-         long bitrate = elapsed ? (long)((float)1000 / KILOBYTE(1) * mostActivePids[i].DataAmount / elapsed) : 0L;
+         long bitrate = elapsed ? (long)(1000.0L * mostActivePids[i].DataAmount / KILOBYTE(1) / elapsed) : 0L;
          if (!IptvConfig.GetUseBytes())
             bitrate *= 8;
          info = cString::sprintf("%sPid %d: %4d (%4ld k%s/s)\n", *info, i,
@@ -84,7 +83,7 @@ cString cIptvPidStatistics::GetStatistic()
                                  IptvConfig.GetUseBytes() ? "B" : "bit");
          }
       }
-  memset(&mostActivePids, '\0', sizeof(mostActivePids));
+  memset(mostActivePids, '\0', sizeof(mostActivePids));
   return info;
 }
 
@@ -100,7 +99,7 @@ int cIptvPidStatistics::SortPids(const void* data1, const void* data2)
   return 0;
 }
 
-void cIptvPidStatistics::AddStatistic(u_short Pid, long Payload)
+void cIptvPidStatistics::AddPidStatistic(u_short Pid, long Payload)
 {
   //debug("cIptvPidStatistics::AddStatistic(pid=%ld, payload=%ld)\n", Pid, Payload);
   cMutexLock MutexLock(&mutex);
@@ -110,7 +109,7 @@ void cIptvPidStatistics::AddStatistic(u_short Pid, long Payload)
       if (mostActivePids[i].pid == Pid) {
          mostActivePids[i].DataAmount += Payload;
          // Now re-sort the array and quit
-         qsort(&mostActivePids, numberOfElements, sizeof(pidStruct), SortPids);
+         qsort(mostActivePids, numberOfElements, sizeof(pidStruct), SortPids);
          return;
          }
       }
@@ -120,7 +119,7 @@ void cIptvPidStatistics::AddStatistic(u_short Pid, long Payload)
       mostActivePids[numberOfElements - 1].pid = Pid;
       mostActivePids[numberOfElements - 1].DataAmount = Payload;
      // Re-sort
-     qsort(&mostActivePids, numberOfElements, sizeof(pidStruct), SortPids);
+     qsort(mostActivePids, numberOfElements, sizeof(pidStruct), SortPids);
      }
 }
 
@@ -140,13 +139,13 @@ cIptvStreamerStatistics::~cIptvStreamerStatistics()
   debug("cIptvStreamerStatistics::~cIptvStreamerStatistics()\n");
 }
 
-cString cIptvStreamerStatistics::GetStatistic()
+cString cIptvStreamerStatistics::GetStreamerStatistic()
 {
   //debug("cIptvStreamerStatistics::GetStatistic()\n");
   cMutexLock MutexLock(&mutex);
   uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
   timer.Set();
-  long bitrate = elapsed ? (long)((float)1000 / KILOBYTE(1) * dataBytes / elapsed) : 0L;
+  long bitrate = elapsed ? (long)(1000.0L * dataBytes / KILOBYTE(1) / elapsed) : 0L;
   if (!IptvConfig.GetUseBytes())
      bitrate *= 8;
   cString info = cString::sprintf("Stream bitrate: %ld k%s/s\n", bitrate, IptvConfig.GetUseBytes() ? "B" : "bit");
@@ -154,7 +153,7 @@ cString cIptvStreamerStatistics::GetStatistic()
   return info;
 }
 
-void cIptvStreamerStatistics::AddStatistic(long Bytes)
+void cIptvStreamerStatistics::AddStreamerStatistic(long Bytes)
 {
   //debug("cIptvStreamerStatistics::AddStatistic(Bytes=%ld)\n", Bytes);
   cMutexLock MutexLock(&mutex);
@@ -177,13 +176,13 @@ cIptvBufferStatistics::~cIptvBufferStatistics()
   debug("cIptvBufferStatistics::~cIptvBufferStatistics()\n");
 }
 
-cString cIptvBufferStatistics::GetStatistic()
+cString cIptvBufferStatistics::GetBufferStatistic()
 {
   //debug("cIptvBufferStatistics::GetStatistic()\n");
   cMutexLock MutexLock(&mutex);
   uint64_t elapsed = timer.Elapsed(); /* in milliseconds */
   timer.Set();
-  long bitrate = elapsed ? (long)((float)1000 / KILOBYTE(1) * dataBytes / elapsed) : 0L;
+  long bitrate = elapsed ? (long)(1000.0L * dataBytes / KILOBYTE(1) / elapsed) : 0L;
   long totalSpace = MEGABYTE(IptvConfig.GetTsBufferSize());
   float percentage = (float)((float)usedSpace / (float)totalSpace * 100.0);
   long totalKilos = totalSpace / KILOBYTE(1);
@@ -201,7 +200,7 @@ cString cIptvBufferStatistics::GetStatistic()
   return info;
 }
 
-void cIptvBufferStatistics::AddStatistic(long Bytes, long Used)
+void cIptvBufferStatistics::AddBufferStatistic(long Bytes, long Used)
 {
   //debug("cIptvBufferStatistics::AddStatistic(Bytes=%ld, Used=%ld)\n", Bytes, Used);
   cMutexLock MutexLock(&mutex);

statistics.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: statistics.h,v 1.10 2007/10/11 23:06:49 rahrenbe Exp $
  */
 
 #ifndef __IPTV_STATISTICS_H
@@ -11,17 +10,15 @@
 
 #include <vdr/thread.h>
 
-#include "statisticif.h"
-
 // Section statistics
-class cIptvSectionStatistics : public cIptvStatisticIf {
+class cIptvSectionStatistics {
 public:
   cIptvSectionStatistics();
   virtual ~cIptvSectionStatistics();
-  cString GetStatistic();
+  cString GetSectionStatistic();
 
 protected:
-  void AddStatistic(long Bytes, long Calls);
+  void AddSectionStatistic(long Bytes, long Calls);
 
 private:
   long filteredData;
@@ -31,14 +28,14 @@ private:
 };
 
 // Pid statistics
-class cIptvPidStatistics : public cIptvStatisticIf {
+class cIptvPidStatistics {
 public:
   cIptvPidStatistics();
   virtual ~cIptvPidStatistics();
-  cString GetStatistic();
+  cString GetPidStatistic();
 
 protected:
-  void AddStatistic(u_short Pid, long Payload);
+  void AddPidStatistic(u_short Pid, long Payload);
 
 private:
   struct pidStruct {
@@ -54,14 +51,14 @@ private:
 };
 
 // Streamer statistics
-class cIptvStreamerStatistics : public cIptvStatisticIf {
+class cIptvStreamerStatistics {
 public:
   cIptvStreamerStatistics();
   virtual ~cIptvStreamerStatistics();
-  cString GetStatistic();
+  cString GetStreamerStatistic();
 
 protected:
-  void AddStatistic(long Bytes);
+  void AddStreamerStatistic(long Bytes);
 
 private:
   long dataBytes;
@@ -70,14 +67,14 @@ private:
 };
 
 // Buffer statistics
-class cIptvBufferStatistics : public cIptvStatisticIf {
+class cIptvBufferStatistics {
 public:
   cIptvBufferStatistics();
   virtual ~cIptvBufferStatistics();
-  cString GetStatistic();
+  cString GetBufferStatistic();
 
 protected:
-  void AddStatistic(long Bytes, long Used);
+  void AddBufferStatistic(long Bytes, long Used);
 
 private:
   long dataBytes;

streamer.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: streamer.c,v 1.23 2007/10/11 23:06:49 rahrenbe Exp $
  */
 
 #include <vdr/thread.h>
@@ -12,13 +11,19 @@
 #include "common.h"
 #include "streamer.h"
 
-cIptvStreamer::cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex)
+cIptvStreamer::cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen)
 : cThread("IPTV streamer"),
   ringBuffer(RingBuffer),
-  mutex(Mutex),
+  packetBufferLen(PacketLen),
   protocol(NULL)
 {
-  debug("cIptvStreamer::cIptvStreamer()\n");
+  debug("cIptvStreamer::cIptvStreamer(%d)\n", packetBufferLen);
+  // Allocate packet buffer
+  packetBuffer = MALLOC(unsigned char, packetBufferLen);
+  if (packetBuffer)
+     memset(packetBuffer, 0, packetBufferLen);
+  else
+     error("MALLOC() failed for packet buffer");
 }
 
 cIptvStreamer::~cIptvStreamer()
@@ -26,30 +31,33 @@ cIptvStreamer::~cIptvStreamer()
   debug("cIptvStreamer::~cIptvStreamer()\n");
   // Close the protocol
   Close();
+  protocol = NULL;
+  ringBuffer = NULL;
+  // Free allocated memory
+  free(packetBuffer);
 }
 
 void cIptvStreamer::Action(void)
 {
   debug("cIptvStreamer::Action(): Entering\n");
+  // Increase priority
+  //SetPriority(-1);
   // Do the thread loop
-  while (Running()) {
+  while (packetBuffer && Running()) {
-    if (ringBuffer && mutex && protocol && ringBuffer->Free()) {
+        int length = -1;
-       unsigned char *buffer = NULL;
+        if (protocol)
-       int length = protocol->Read(&buffer);
+           length = protocol->Read(packetBuffer, packetBufferLen);
-       if (length >= 0) {
+        if (length > 0) {
-          AddStatistic(length);
+           AddStreamerStatistic(length);
-          mutex->Lock();
+           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
-          cCondWait::SleepMs(100); // to reduce cpu load
+           sleep.Wait(10); // to avoid busy loop and reduce cpu load
-       }
+        }
-    else
-       cCondWait::SleepMs(100); // and avoid busy loop
-    }
   debug("cIptvStreamer::Action(): Exiting\n");
 }
 
@@ -57,9 +65,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;
@@ -69,6 +76,7 @@ bool cIptvStreamer::Close(void)
 {
   debug("cIptvStreamer::Close()\n");
   // Stop thread
+  sleep.Signal();
   if (Running())
      Cancel(3);
   // Close the protocol
@@ -77,21 +85,22 @@ bool cIptvStreamer::Close(void)
   return true;
 }
 
-bool cIptvStreamer::Set(const char* Address, const int Port, cIptvProtocolIf* Protocol)
+bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol)
 {
-  debug("cIptvStreamer::Set(): %s:%d\n", Address, Port);
+  debug("cIptvStreamer::Set(): %s:%d\n", Location, Parameter);
-  if (!isempty(Address)) {
+  if (!isempty(Location)) {
-     // Update protocol; Close the existing one if changed
+     // Update protocol and set location and parameter; Close the existing one if changed
      if (protocol != Protocol) {
         if (protocol)
            protocol->Close();
         protocol = Protocol;
-        if (protocol)
+        if (protocol) {
+           protocol->Set(Location, Parameter, Index);
            protocol->Open();
+           }
         }
-     // Set protocol address and port
+     else if (protocol)
-     if (protocol)
+        protocol->Set(Location, Parameter, Index);
-        protocol->Set(Address, Port);
      }
   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.11 2007/10/09 22:12:17 rahrenbe Exp $
  */
 
 #ifndef __IPTV_STREAMER_H
@@ -20,20 +19,21 @@
 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:
+protected:
-  cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex);
-  virtual ~cIptvStreamer();
   virtual void Action(void);
-  bool Set(const char* Address, const int Port, cIptvProtocolIf* Protocol);
+
+public:
+  cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen);
+  virtual ~cIptvStreamer();
+  bool Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol);
   bool Open(void);
   bool Close(void);
   cString GetInformation(void);
 };
 
 #endif // __IPTV_STREAMER_H
-