Added FreeBSD support (Thanks to Jürgen Lock).

Updated translations.
Updated README.
2023-10-10 11:37:03 +00:00 · 2012-07-10 22:12:29 +03:00 · 2012-06-03 12:31:33 +03:00 · 2012-06-03 12:24:09 +03:00 · 2012-06-02 21:57:29 +03:00 · 2012-06-02 15:37:05 +03:00
58 changed files with 3185 additions and 2427 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.dependencies
+*.o
+*.so
+*~
+po/*.pot
+po/*.mo
--- a/165
+++ b/165
@@ -1,5 +1,6 @@
+==================================
 VDR Plugin 'iptv' Revision History
----------------------------------
+==================================

 2007-10-14: Version 0.0.1

@@ -18,3 +19,165 @@ VDR Plugin 'iptv' Revision History
 - 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).
+
+2010-06-06: Version 0.4.2
+
+- Updated for vdr-1.7.15.
+
+2012-02-02: Version 0.5.0
+
+- Updated for vdr-1.7.23.
+- Renamed Sid scanner to section id scanner and added
+  experimental Tid/Nid support into it.
+- Added optional source address validation for UDP protocol.
+- Fixed audio pid detection in pid scanner.
+- Changed ProvidesChannel() to set the need of detaching
+  receivers due to VDR's channel selection mechanism.
+- Enabled partial content responses for HTTP protocol.
+- Fixed EXT protocol execution (Thanks to Peter Holik).
+- Disable detaching of receivers if retuned to an existing
+  channel (Thanks to Zdeněk Kopřivík).
+- Canonicalized the configuration directory.
+- Added support for LDFLAGS.
+- Added cppcheck target into Makefile.
+
+2012-04-02: Version 0.5.1
+
+- Updated for vdr-1.7.27.
+- Updated Makefile.
+- Silenced compilation warnings.
+- Fixed channel switching bugs.
+- Added support for a service interface.
+- Changed UDP protocol to always utilize the source address
+  validation.
+
+2012-04-26: Version 0.5.2
+
+- Fixed connection problems in HTTP protocol.
+
+2012-06-03: Version 1.0.0
+
+- Optimized reading from UDP sockets.
+- Fixed ProvidesChannel method.
+
+2012-07-10: Version 1.0.1
+
+- Added FreeBSD support (Thanks to Jürgen Lock).
--- a/101
+++ b/101
@@ -1,14 +1,19 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for IPTV plugin
 #
-# $Id: Makefile,v 1.22 2007/10/28 16:26:28 rahrenbe Exp $

 # Debugging on/off 
 #IPTV_DEBUG = 1

+# Default shell for EXT protocol
+#IPTV_EXTSHELL = /bin/bash
+
 # Strip debug symbols?  Set eg. to /bin/true if not
 STRIP = strip

+# Install command
+INSTALL = cp --remove-destination
+
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
@@ -19,18 +24,24 @@ 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 'const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$5 }' | sed -e 's/[";]//g')
+GITTAG  = $(shell git describe --always 2>/dev/null)

 ### The C++ compiler and options:

 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O3 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Werror=overloaded-virtual -Wno-parentheses
+LDFLAGS  ?= -Wl,--as-needed

 ### The directory environment:

-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
+
+### Make sure that necessary options are included:
+
+-include $(VDRDIR)/Make.global

 ### Allow user defined options to overwrite defaults:

@@ -40,9 +51,6 @@ TMPDIR = /tmp

 APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)

-### Test whether VDR has locale support
-VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
-
 ### The name of the distribution archive:

 ARCHIVE = $(PLUGIN)-$(VERSION)
@@ -58,11 +66,22 @@ ifdef IPTV_DEBUG
 DEFINES += -DDEBUG
 endif

+ifdef IPTV_EXTSHELL
+DEFINES += -DEXTSHELL='"$(IPTV_EXTSHELL)"'
+endif
+
+ifneq ($(strip $(GITTAG)),)
+DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'
+endif
+
+.PHONY: all all-redirect
+all-redirect: all
+
 ### The object files (add further files here):

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

 ### The main target:

@@ -70,7 +89,7 @@ all: libvdr-$(PLUGIN).so i18n

 ### Implicit rules:

-%.o: %.c
+%.o: %.c Makefile
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<

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

 -include $(DEPFILE)

@@ -87,67 +106,45 @@ $(DEPFILE): Makefile
 PODIR     = po
 LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
-ifeq ($(strip $(APIVERSION)),1.5.7)
-I18Nvdrmo = $(PLUGIN).mo
-else
-I18Nvdrmo = vdr-$(PLUGIN).mo
-endif
-
-### Do gettext based i18n stuff
-
-ifneq ($(strip $(VDRLOCALE)),)

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

 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $(subst i18n.c,,$(wildcard *.c))
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name='vdr-$(PLUGIN)' --package-version='$(VERSION)' --msgid-bugs-address='<see README>' -o $@ `ls $^`

-$(I18Npo): $(I18Npot)
+%.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@

-i18n: $(I18Npot) $(I18Nmo)
-	@mkdir -p $(LOCALEDIR)
-	for i in $(I18Ndirs); do\
-	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(I18Nvdrmo);\
-	    done
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@

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

 ### Targets:

 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 ifndef IPTV_DEBUG
 	@$(STRIP) $@
 endif
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+	@$(INSTALL) $@ $(LIBDIR)/$@.$(APIVERSION)

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

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

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

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

@@ -17,7 +17,7 @@ See the file COPYING for more information.

 Requirements:

-An IPTV patched VDR setup and DVB compatible MPEG1/2 network video streams.
+DVB compatible MPEG1/2 or H.264 network video streams.

 Description:

@@ -44,11 +44,6 @@ cd /put/your/path/here/VDR/PLUGINS/src
 tar -xzf /put/your/path/here/vdr-iptv-X.Y.Z.tgz
 ln -s iptv-X.Y.Z iptv
 cd /put/your/path/here/VDR
-# Note: pluginparam patch is required for every vdr
-patch -p1 < PLUGINS/src/iptv/patches/vdr-X.Y.Z-pluginparam.patch
-# Note: closefilter patch is required only for vdr-1.5.9 or earlier
-patch -p1 < PLUGINS/src/iptv/patches/vdr-X.Y.Z-closefilter.patch
-cp sources.conf /path/to/vdrconf/
 cp -R PLUGINS/src/iptv/iptv /path/to/vdrconf/plugins/
 make
 make plugins
@@ -70,10 +65,6 @@ Setup menu:
 - Use section filtering = 1        Defines whether section filtering shall
                                   be used.
                                   Valid range: 0...1
- Scan Sid automatically = 1       Defines whether service id shall be
-                                   scanned automatically. Requires section
-                                   filtering.
-                                   Valid range: 0...1
 - Disable filters = 0              Certain section filters might cause some
                                   unwanted behaviour to VDR such as time
                                   being falsely synchronized etc. This
@@ -84,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.
@@ -107,26 +88,33 @@ Configuration:

 - channels.conf

-  TV4;IPTV:4:IPTV|EXT|iptvstream.sh|0:P:0:0:680:0:0:4:0:0:0
-  TV3;IPTV:3:IPTV|FILE|/video/stream.ts|5:P:0:514:670:2321:0:3:0:0:0
-  TV2;IPTV:2:IPTV|HTTP|127.0.0.1/TS/2|3000:P:0:513:660:2321:0:2:0:0:0
-  TV1;IPTV:1:IPTV|UDP|127.0.0.1|1234:P:0:512:650:2321:0:1:0:0:0
-           ^ ^    ^   ^         ^    ^
-           | |    |   |         |    Source type ("P")
-           | |    |   |         IP Port Number, File delay (ms), Script parameter
-           | |    |   IP Address, File location, Script location
-           | |    Protocol ("UDP", "HTTP", "FILE", "EXT")
-           | Plugin ID ("IPTV")
+  TV4;IPTV:40:S=1|P=0|F=EXT|U=iptvstream.sh|A=0:I:0:0:680:0:0:4: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
+  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 ("I")
+           |  |   |   |     |           Stream parameter (multicast port
+           |  |   |   |     |           number, HTTP port number, file delay
+           |  |   |   |     |           (ms), script parameter)
+           |  |   |   |     Stream address (multicast address, URL, file
+           |  |   |   |     location, script location)
+           |  |   |   Stream protocol ("UDP", "HTTP", "FILE", "EXT")
+           |  |   Pid scanner ("0" disable, "1" enable)
+           |  Section id (Sid/Nid/Tid) scanner ("0" disable, "1" enable)
           Unique enumeration

 - UDP multicast rules for iptables firewall

-  # Multicast UDP -packets
+  # Multicast UDP packets
  iptables -A INPUT -i eth0 -p udp -d 224.0.0.0/4 --dport 1234 -j ACCEPT

  # IGMP required by multicasts
  iptables -A INPUT -i eth0 -p igmp -d 224.0.0.0/4 -j ACCEPT

+  # Default routing for multicast
+  route add -net 224.0.0.0 netmask 224.0.0.0 eth0
+
 External streaming:

 - To watch an externally received channel add an EXT entry to channels.conf
@@ -146,8 +134,7 @@ External streaming:
  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. The
-  plugin was tested with VLC version 0.8.6c.
+  receiving streams, transcoding and handing the result to IPTV plugin.

 Notes:

@@ -158,8 +145,30 @@ 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.
+
+- If received MPEG-2 TS streams carry CA descriptors, you'll have to apply
+  "disable_ca_updates" patch to the VDR in order to get rid of "Channel not
+  available" messages.
+
+- EIT scanning functionality can be disabled for all IPTV channels by applying
+  the "disable_eitscan" patch to the VDR.
+
+- Section id and pid scanners should be disabled after the correct data is
+  found. This can be made via VDR's channel editor.
+
 Acknowledgements:

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

- Udo Richter's po2i18n package is used to support VDR's old i18n system.
+- The pid scanning code is derived from Udo Richter's streamplayer plugin.
--- a/common.c
+++ b/common.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: common.c,v 1.8 2007/10/26 23:18:50 rahrenbe Exp $
 */

 #include <vdr/tools.h>
@@ -11,7 +10,7 @@

 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)
@@ -23,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;
@@ -50,9 +49,9 @@ int select_single_desc(int descriptor, const int usecs, const bool selectWrite)
  FD_SET(descriptor, &fds);
  int retval = 0;
  if (selectWrite)
-    retval = select(descriptor + 1, NULL, &fds, NULL, &tv);
+     retval = select(descriptor + 1, NULL, &fds, NULL, &tv);
  else
-    retval = select(descriptor + 1, &fds, NULL, NULL, &tv);
+     retval = select(descriptor + 1, &fds, NULL, NULL, &tv);
  // Check if error
  ERROR_IF_RET(retval < 0, "select()", return retval);
  return retval;
--- a/common.h
+++ b/common.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: common.h,v 1.18 2007/10/28 16:22:44 rahrenbe Exp $
 */

 #ifndef __IPTV_COMMON_H
@@ -15,24 +14,24 @@

 #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

-#ifndef trNOOP
-#define trNOOP(s) (s)
-#endif
+#define ELEMENTS(x)                     (sizeof(x) / sizeof(x[0]))

-#ifndef trVDR
-#define trVDR(s) tr(s)
-#endif
+#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
 #define IPTV_DEVICE_INFO_FILTERS        3
+#define IPTV_DEVICE_INFO_PROTOCOL       4
+#define IPTV_DEVICE_INFO_BITRATE        5

 #define IPTV_STATS_ACTIVE_PIDS_COUNT    10
 #define IPTV_STATS_ACTIVE_FILTERS_COUNT 10
@@ -40,13 +39,14 @@
 #define SECTION_FILTER_TABLE_SIZE       7

 #define ERROR_IF_FUNC(exp, errstr, func, ret) \
-  do {                                                                     \
-     if (exp) {                                                            \
-        char tmp[64];                                                      \
-        error("ERROR: "errstr": %s", strerror_r(errno, tmp, sizeof(tmp))); \
-        func;                                                              \
-        ret;                                                               \
-        }                                                                  \
+  do {                                        \
+     if (exp) {                               \
+        char tmp[64];                         \
+        strerror_r(errno, tmp, sizeof(tmp));  \
+        error(errstr": %s", tmp);             \
+        func;                                 \
+        ret;                                  \
+        }                                     \
  } while (0)


@@ -63,6 +63,8 @@
        }                         \
  } 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);
@@ -78,5 +80,7 @@ struct section_filter_table_type {

 extern const section_filter_table_type section_filter_table[SECTION_FILTER_TABLE_SIZE];

+extern const char VERSION[];
+
 #endif // __IPTV_COMMON_H

--- a/config.c
+++ b/config.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: config.c,v 1.18 2007/10/20 17:26:46 rahrenbe Exp $
 */

 #include "config.h"
@@ -11,40 +10,38 @@
 cIptvConfig IptvConfig;

 cIptvConfig::cIptvConfig(void)
-: readBufferTsCount(48),
-  tsBufferSize(2),
+: tsBufferSize(2),
  tsBufferPrefillRatio(0),
  extProtocolBasePort(4321),
  useBytes(1),
-  sectionFiltering(1),
-  sidScanning(1)
+  sectionFiltering(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)))
-    n++;
+  while ((n < ARRAY_SIZE(disabledFilters) && (disabledFilters[n] != -1)))
+        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));
+  debug("cIptvConfig::SetConfigDirectory(%s)\n", directoryP);
+  ERROR_IF(!realpath(directoryP, configDirectory), "Cannot canonicalize configuration directory");
 }
--- a/config.h
+++ b/config.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: config.h,v 1.17 2007/10/28 16:22:44 rahrenbe Exp $
 */

 #ifndef __IPTV_CONFIG_H
@@ -15,34 +14,29 @@
 class cIptvConfig
 {
 private:
-  unsigned int readBufferTsCount;
  unsigned int tsBufferSize;
  unsigned int tsBufferPrefillRatio;
  unsigned int extProtocolBasePort;
  unsigned int useBytes;
  unsigned int sectionFiltering;
-  unsigned int sidScanning;
  int disabledFilters[SECTION_FILTER_TABLE_SIZE];
-  char configDirectory[255];
+  char configDirectory[PATH_MAX];

 public:
  cIptvConfig();
-  unsigned int GetReadBufferTsCount(void) { return readBufferTsCount; }
-  unsigned int GetTsBufferSize(void) { return tsBufferSize; }
-  unsigned int GetTsBufferPrefillRatio(void) { return tsBufferPrefillRatio; }
-  unsigned int GetExtProtocolBasePort(void) { return extProtocolBasePort; }
-  unsigned int GetUseBytes(void) { return useBytes; }
-  unsigned int GetSectionFiltering(void) { return sectionFiltering; }
-  unsigned int GetSidScanning(void) { return sidScanning; }
-  const char *GetConfigDirectory(void) { return configDirectory; }
-  unsigned int GetDisabledFiltersCount(void);
-  int GetDisabledFilters(unsigned int Index);
+  unsigned int GetTsBufferSize(void) const { return tsBufferSize; }
+  unsigned int GetTsBufferPrefillRatio(void) const { return tsBufferPrefillRatio; }
+  unsigned int GetExtProtocolBasePort(void) const { return extProtocolBasePort; }
+  unsigned int GetUseBytes(void) const { return useBytes; }
+  unsigned int GetSectionFiltering(void) const { return sectionFiltering; }
+  const char *GetConfigDirectory(void) const { return configDirectory; }
+  unsigned int GetDisabledFiltersCount(void) const;
+  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);
 };
--- a/device.c
+++ b/device.c
@@ -3,54 +3,71 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: device.c,v 1.76 2007/10/26 23:48:30 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),
+  channelId(tChannelID::InvalidID)
 {
-  debug("cIptvDevice::cIptvDevice(%d)\n", deviceIndex);
-  tsBuffer = new cRingBufferLinear(MEGABYTE(IptvConfig.GetTsBufferSize()),
-                                   (TS_SIZE * IptvConfig.GetReadBufferTsCount()),
-                                   false, "IPTV");
-  tsBuffer->SetTimeouts(100, 100);
+  unsigned int bufsize = (unsigned int)MEGABYTE(IptvConfig.GetTsBufferSize());
+  bufsize -= (bufsize % TS_SIZE);
+  isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndex, CardIndex());
+  tsBuffer = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
+                                   *cString::sprintf("IPTV %d", deviceIndex));
+  tsBuffer->SetTimeouts(10, 10);
  ResetBuffering();
  pUdpProtocol = new cIptvProtocolUdp();
  pHttpProtocol = new cIptvProtocolHttp();
  pFileProtocol = new cIptvProtocolFile();
  pExtProtocol = new cIptvProtocolExt();
-  pIptvStreamer = new cIptvStreamer(tsBuffer, &mutex);
+  pIptvStreamer = new cIptvStreamer(tsBuffer, (100 * TS_SIZE));
+  pPidScanner = new cPidScanner();
  // Initialize filter pointers
-  memset(&secfilters, '\0', sizeof(secfilters));
+  memset(secfilters, '\0', sizeof(secfilters));
  // Start section handler for iptv device
  StartSectionHandler();
  // Sid scanner must be created after the section handler
-  pSidScanner = new cSidScanner;
+  pSidScanner = new cSidScanner();
  if (pSidScanner)
     AttachFilter(pSidScanner);
+  // Check if dvr fifo exists
+  struct stat sb;
+  cString filename = cString::sprintf(IPTV_DVR_FILENAME, deviceIndex);
+  stat(filename, &sb);
+  if (S_ISFIFO(sb.st_mode)) {
+     dvrFd = open(filename, O_RDWR | O_NONBLOCK);
+     if (dvrFd >= 0)
+        dsyslog("IPTV device %d redirecting input stream to '%s'", deviceIndex, *filename);
+     }
 }

 cIptvDevice::~cIptvDevice()
 {
  debug("cIptvDevice::~cIptvDevice(%d)\n", deviceIndex);
+  // Stop section handler of iptv device
+  StopSectionHandler();
  DELETE_POINTER(pIptvStreamer);
  DELETE_POINTER(pUdpProtocol);
  DELETE_POINTER(pHttpProtocol);
  DELETE_POINTER(pFileProtocol);
  DELETE_POINTER(pExtProtocol);
  DELETE_POINTER(tsBuffer);
+  DELETE_POINTER(pPidScanner);
  // Detach and destroy sid filter
  if (pSidScanner) {
     Detach(pSidScanner);
@@ -59,11 +76,18 @@ cIptvDevice::~cIptvDevice()
  // Destroy all filters
  for (int i = 0; i < eMaxSecFilterCount; ++i)
      DeleteFilter(i);
+  // Close dvr fifo
+  if (dvrFd >= 0) {
+     int fd = dvrFd;
+     dvrFd = -1;
+     close(fd);
+     }
 }

 bool cIptvDevice::Initialize(unsigned int DeviceCount)
 {
  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)
@@ -99,18 +123,18 @@ cIptvDevice *cIptvDevice::GetIptvDevice(int CardIndex)
 cString cIptvDevice::GetGeneralInformation(void)
 {
  //debug("cIptvDevice::GetGeneralInformation(%d)\n", deviceIndex);
-  return cString::sprintf("IPTV device: %d\nCardIndex: %d\n%s%s%sChannel: %s",
+  return cString::sprintf("IPTV device: %d\nCardIndex: %d\nStream: %s\nStream bitrate: %s\n%sChannel: %s",
                          deviceIndex, CardIndex(),
                          pIptvStreamer ? *pIptvStreamer->GetInformation() : "",
-                          pIptvStreamer ? *pIptvStreamer->GetStatistic() : "",
-                          *cIptvBufferStatistics::GetStatistic(),
+                          pIptvStreamer ? *pIptvStreamer->GetStreamerStatistic() : "",
+                          *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)
@@ -122,7 +146,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;
@@ -145,6 +169,12 @@ cString cIptvDevice::GetInformation(unsigned int Page)
    case IPTV_DEVICE_INFO_FILTERS:
         info = GetFiltersInformation();
         break;
+    case IPTV_DEVICE_INFO_PROTOCOL:
+         info = pIptvStreamer ? *pIptvStreamer->GetInformation() : "";
+         break;
+    case IPTV_DEVICE_INFO_BITRATE:
+         info = pIptvStreamer ? *pIptvStreamer->GetStreamerStatistic() : "";
+         break;
    default:
         info = cString::sprintf("%s%s%s",
                                 *GetGeneralInformation(),
@@ -155,82 +185,112 @@ cString cIptvDevice::GetInformation(unsigned int Page)
  return info;
 }

-cString cIptvDevice::GetChannelSettings(const char *IptvParam, int *Parameter, cIptvProtocolIf* *Protocol)
+cString cIptvDevice::DeviceType(void) const
 {
-  debug("cIptvDevice::GetChannelSettings(%d)\n", deviceIndex);
-  char *tag = NULL;
-  char *proto = NULL;
-  char *loc = NULL;
-  if (sscanf(IptvParam, "%a[^|]|%a[^|]|%a[^|]|%u", &tag, &proto, &loc, Parameter) == 4) {
-     cString tagstr(tag, true);
-     cString protostr(proto, true);
-     cString locstr(loc, true);
-     // check if IPTV tag
-     if (strncasecmp(*tagstr, "IPTV", 4) == 0) {
-        // check if protocol is supported and update the pointer
-        if (strncasecmp(*protostr, "UDP", 3) == 0)
-           *Protocol = pUdpProtocol;
-        else if (strncasecmp(*protostr, "HTTP", 4) == 0)
-           *Protocol = pHttpProtocol;
-        else if (strncasecmp(*protostr, "FILE", 4) == 0)
-           *Protocol = pFileProtocol;
-        else if (strncasecmp(*protostr, "EXT", 3) == 0)
-           *Protocol = pExtProtocol;
-        else
-           return NULL;
-        // return location
-        return locstr;
-        }
-     }
-  return NULL;
+  debug("cIptvDevice::DeviceType(%d)\n", deviceIndex);
+  return "IPTV";
 }

-bool cIptvDevice::ProvidesIptv(const char *Param) const
+cString cIptvDevice::DeviceName(void) const
 {
-  debug("cIptvDevice::ProvidesIptv(%d)\n", deviceIndex);
-  return (strncasecmp(Param, "IPTV", 4) == 0);
+  debug("cIptvDevice::DeviceName(%d)\n", deviceIndex);
+  return cString::sprintf("IPTV %d", deviceIndex);
+}
+
+int cIptvDevice::SignalStrength(void) const
+{
+  debug("cIptvDevice::SignalStrength(%d)\n", deviceIndex);
+  return (100);
+}
+
+int cIptvDevice::SignalQuality(void) const
+{
+  debug("cIptvDevice::SignalQuality(%d)\n", deviceIndex);
+  return (100);
 }

 bool cIptvDevice::ProvidesSource(int Source) const
 {
  debug("cIptvDevice::ProvidesSource(%d)\n", deviceIndex);
-  return (cSource::IsPlug(Source));
+  return (cSource::IsType(Source, IPTV_SOURCE_CHARACTER));
 }

 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
 {
  bool result = false;
+  bool hasPriority = Priority == IDLEPRIORITY || Priority > this->Priority();
  bool needsDetachReceivers = false;

  debug("cIptvDevice::ProvidesChannel(%d)\n", deviceIndex);
-  if (ProvidesTransponder(Channel))
-     result = true;
+
+  if (Channel && ProvidesTransponder(Channel)) {
+     result = hasPriority;
+     if (Receiving()) {
+        if (Channel->GetChannelID() == channelId)
+           result = true;
+        else
+           needsDetachReceivers = Receiving();
+        }
+     }
  if (NeedsDetachReceivers)
     *NeedsDetachReceivers = needsDetachReceivers;
  return result;
 }

+bool cIptvDevice::ProvidesEIT(void) const
+{
+  return false;
+}
+
+int cIptvDevice::NumProvidedSystems(void) const
+{
+  return 1;
+}
+
 bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-  int parameter;
-  cString location;
  cIptvProtocolIf *protocol;
+  cIptvTransponderParameters itp(Channel->Parameters());

  debug("cIptvDevice::SetChannelDevice(%d)\n", deviceIndex);
-  location = GetChannelSettings(Channel->PluginParam(), &parameter, &protocol);
-  if (isempty(location)) {
-     error("ERROR: Unrecognized IPTV channel settings: %s", Channel->PluginParam());
+
+  if (isempty(itp.Address())) {
+     error("Unrecognized IPTV address: %s", Channel->Parameters());
     return false;
     }
-  pIptvStreamer->Set(location, parameter, deviceIndex, protocol);
-  if (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
-     pSidScanner->SetChannel(Channel);
+  switch (itp.Protocol()) {
+    case cIptvTransponderParameters::eProtocolUDP:
+         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)) {
+     channelId = Channel->GetChannelID();
+     if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+        pSidScanner->SetChannel(channelId);
+     if (pidScanEnabled && pPidScanner)
+        pPidScanner->SetChannel(channelId);
+     }
  return true;
 }

@@ -252,7 +312,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
@@ -277,11 +337,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();
         }
      }
@@ -291,6 +353,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);
@@ -303,14 +368,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 (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
-     pSidScanner->SetStatus(true);
+  if (pIptvStreamer)
+     pIptvStreamer->Open();
+  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+     pSidScanner->Open();
  isOpenDvr = true;
  return true;
 }
@@ -318,9 +382,10 @@ bool cIptvDevice::OpenDvr(void)
 void cIptvDevice::CloseDvr(void)
 {
  debug("cIptvDevice::CloseDvr(%d)\n", deviceIndex);
-  if (pSidScanner && IptvConfig.GetSectionFiltering() && IptvConfig.GetSidScanning())
-     pSidScanner->SetStatus(false);
-  pIptvStreamer->Close();
+  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+     pSidScanner->Close();
+  if (pIptvStreamer)
+     pIptvStreamer->Close();
  isOpenDvr = false;
 }

@@ -334,7 +399,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);
 }
@@ -351,15 +416,15 @@ bool cIptvDevice::IsBuffering(void)

 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());
        }
+     int Count = 0;
     uchar *p = tsBuffer->Get(Count);
     if (p && Count >= TS_SIZE) {
        if (*p != TS_SYNC_BYTE) {
@@ -370,23 +435,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 
-	cIptvPidStatistics::AddStatistic(ts_pid(p), payload(p));
+        // Update pid statistics
+        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(100);
+  cCondWait::SleepMs(10);
  Data = NULL;
  return true;
 }
--- a/device.h
+++ b/device.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: device.h,v 1.34 2007/10/19 21:36:28 rahrenbe Exp $
 */

 #ifndef __IPTV_DEVICE_H
@@ -17,6 +16,7 @@
 #include "protocolext.h"
 #include "streamer.h"
 #include "sectionfilter.h"
+#include "pidscanner.h"
 #include "sidscanner.h"
 #include "statistics.h"

@@ -34,18 +34,23 @@ private:
    eMaxSecFilterCount = 32
  };
  unsigned int deviceIndex;
+  int dvrFd;
  bool isPacketDelivered;
  bool isOpenDvr;
+  bool sidScanEnabled;
+  bool pidScanEnabled;
  cRingBufferLinear *tsBuffer;
  int tsBufferPrefill;
+  tChannelID channelId;
  cIptvProtocolUdp *pUdpProtocol;
  cIptvProtocolHttp *pHttpProtocol;
  cIptvProtocolFile *pFileProtocol;
  cIptvProtocolExt *pExtProtocol;
  cIptvStreamer *pIptvStreamer;
+  cPidScanner *pPidScanner;
  cSidScanner *pSidScanner;
  cMutex mutex;
-  cIptvSectionFilter* secfilters[eMaxSecFilterCount];
+  cIptvSectionFilter *secfilters[eMaxSecFilterCount];

  // constructor & destructor
 public:
@@ -53,26 +58,36 @@ 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 *IptvParam, int *Parameter, 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 info
+  virtual cString DeviceType(void) const;
+  virtual cString DeviceName(void) const;
+  virtual int SignalStrength(void) const;
+  virtual int SignalQuality(void) 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 bool ProvidesEIT(void) const;
+  virtual int NumProvidedSystems(void) const;
 protected:
  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);

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

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

-#ifndef PLUGINPARAMPATCHVERSNUM
-#error "You must apply the pluginparam patch for VDR!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10727
+#error "VDR-1.7.27 API version or greater is required!"
 #endif

-#if defined(APIVERSNUM) && APIVERSNUM < 10510 && !defined(CLOSEFILTERPATCHVERSNUM)
-#error "You must apply the closefilter patch for VDR!"
+#ifndef GITVERSION
+#define GITVERSION ""
 #endif

-static const char VERSION[]     = "0.0.3";
+       const char VERSION[]     = "1.0.1" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");

 class cPluginIptv : public cPlugin {
@@ -79,20 +78,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' },
-       { NULL }
-     };
+    { "devices", required_argument, NULL, 'd' },
+    { NULL,      no_argument,       NULL,  0  }
+    };

  int c;
  while ((c = getopt_long(argc, argv, "d:", long_options, NULL)) != -1) {
-        switch (c) {
-          case 'd':
-               deviceCount = atoi(optarg);
-               break;
-          default:
-               return false;
-          }
-        }
+    switch (c) {
+      case 'd':
+           deviceCount = atoi(optarg);
+           break;
+      default:
+           return false;
+      }
+    }
  return true;
 }

@@ -100,9 +99,6 @@ bool cPluginIptv::Initialize(void)
 {
  debug("cPluginIptv::Initialize()\n");
  // Initialize any background activities the plugin shall perform.
-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-  RegisterI18n(IptvPhrases);
-#endif
  IptvConfig.SetConfigDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
  return cIptvDevice::Initialize(deviceCount);
 }
@@ -167,14 +163,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));
-        int i = atoi(buffer);
-        //debug("cPluginIptv::ParseFilters(): Filters[%d]=%d\n", n, i);
-        if (i >= 0)
-           Filters[n++] = i;
-        if ((Value = strchr(Value, ' ')) != NULL)
-           Value++;
-        }
+    strn0cpy(buffer, Value, sizeof(buffer));
+    int i = atoi(buffer);
+    //debug("cPluginIptv::ParseFilters(): Filters[%d]=%d\n", n, i);
+    if (i >= 0)
+       Filters[n++] = i;
+    if ((Value = strchr(Value, ' ')) != NULL)
+       Value++;
+    }
  return n;
 }

@@ -190,12 +186,12 @@ bool cPluginIptv::SetupParse(const char *Name, const char *Value)
     IptvConfig.SetExtProtocolBasePort(atoi(Value));
  else if (!strcasecmp(Name, "SectionFiltering"))
     IptvConfig.SetSectionFiltering(atoi(Value));
-  else if (!strcasecmp(Name, "SidScanning"))
-     IptvConfig.SetSidScanning(atoi(Value));
  else if (!strcasecmp(Name, "DisabledFilters")) {
-     int DisabledFilters[SECTION_FILTER_TABLE_SIZE] = { -1 };
-     int DisabledFiltersCount = ParseFilters(Value, DisabledFilters);
-     for (int i = 0; i < DisabledFiltersCount; ++i)
+     int DisabledFilters[SECTION_FILTER_TABLE_SIZE];
+     for (unsigned int i = 0; i < ARRAY_SIZE(DisabledFilters); ++i)
+         DisabledFilters[i] = -1;
+     unsigned int DisabledFiltersCount = ParseFilters(Value, DisabledFilters);
+     for (unsigned int i = 0; i < DisabledFiltersCount; ++i)
         IptvConfig.SetDisabledFilters(i, DisabledFilters[i]);
     }
  else
@@ -205,8 +201,18 @@ bool cPluginIptv::SetupParse(const char *Name, const char *Value)

 bool cPluginIptv::Service(const char *Id, void *Data)
 {
-  //debug("cPluginIptv::Service()\n");
-  // Handle custom service requests from other plugins
+  debug("cPluginIptv::Service()\n");
+  if (strcmp(Id,"IptvService-v1.0") == 0) {
+     if (Data) {
+        IptvService_v1_0 *data = (IptvService_v1_0*)Data;
+        cIptvDevice *dev = cIptvDevice::GetIptvDevice(data->cardIndex);
+        if (!dev)
+           return false;
+        data->protocol = dev->GetInformation(IPTV_DEVICE_INFO_PROTOCOL);
+        data->bitrate  = dev->GetInformation(IPTV_DEVICE_INFO_BITRATE);
+        }
+     return true;
+     }
  return false;
 }

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

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

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

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

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

 # Create unique pids for the stream
@@ -42,5 +76,12 @@ let VPID=${PARAMETER}+1
 let APID=${PARAMETER}+2
 let SPID=${PARAMETER}+3

-# Use 'exec' for capturing program pid for further management in IPTV plugin
-exec vlc "${URL}" --sout "#transcode{vcodec=mp2v,acodec=mpga,vb=${VBITRATE},ab=${ABITRATE}}:standard{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}" --intf dummy
+# 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}
--- a/iptv/linein.sh
+++ b/iptv/linein.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# linein.sh is used by the VDR iptv plugin to transcode line-in of
+# a soundcard.
+#
+# The script originates from:
+# http://www.vdr-wiki.de/wiki/index.php/Iptv-plugin
+#
+# An example channels.conf entry:
+# linein;IPTV:5: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
--- a/iptv/vlc2iptv
+++ b/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}
--- a/iptv/webcam.sh
+++ b/iptv/webcam.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# webcam.sh is used by the VDR iptv plugin to transcode an internet radio
+# stream remuxed with images (e.g. webcam) to provide a video stream.
+#
+# The script originates from:
+# http://www.vdr-wiki.de/wiki/index.php/Iptv-plugin
+#
+# An example channels.conf entry:
+# webcam;IPTV:3: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
--- a/iptvservice.h
+++ b/iptvservice.h
@@ -0,0 +1,22 @@
+/*
+ * iptvservice.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __IPTVSERVICE_H
+#define __IPTVSERVICE_H
+
+#include <vdr/tools.h>
+
+#define stIptv ('I' << 24)
+
+struct IptvService_v1_0 {
+  unsigned int cardIndex;
+  cString protocol;
+  cString bitrate;
+  };
+
+#endif //__IPTVSERVICE_H
+
--- a/patches/vdr-1.4.7-closefilter.patch
+++ b/patches/vdr-1.4.7-closefilter.patch
@@ -1,80 +0,0 @@
-diff -Nru vdr-1.4.7-vanilla/config.h vdr-1.4.7-closefilter/config.h
--- vdr-1.4.7-vanilla/config.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/config.h	2007-10-27 01:39:43.000000000 +0300
-@@ -29,6 +29,8 @@
- #define APIVERSION  "1.4.5"
- #define APIVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
- 
-+#define CLOSEFILTERPATCHVERSNUM 1
-+
- // When loading plugins, VDR searches them by their APIVERSION, which
- // may be smaller than VDRVERSION in case there have been no changes to
- // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.4.7-vanilla/device.c vdr-1.4.7-closefilter/device.c
--- vdr-1.4.7-vanilla/device.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/device.c	2007-10-27 01:37:34.000000000 +0300
-@@ -509,6 +509,11 @@
-   return -1;
- }
- 
-+void cDevice::CloseFilter(int Handle)
-+{
-+  close(Handle);
-+}
-+
- void cDevice::AttachFilter(cFilter *Filter)
- {
-   if (sectionHandler)
-diff -Nru vdr-1.4.7-vanilla/device.h vdr-1.4.7-closefilter/device.h
--- vdr-1.4.7-vanilla/device.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/device.h	2007-10-27 01:37:19.000000000 +0300
-@@ -302,6 +302,11 @@
-        ///< Opens a file handle for the given filter data.
-        ///< A derived device that provides section data must
-        ///< implement this function.
-+  virtual void CloseFilter(int Handle);
-+       ///< Closes a file handle that has previously been opened
-+       ///< by OpenFilter(). If this is as simple as calling close(Handle),
-+       ///< a derived class need not implement this function, because this
-+       ///< is done by the default implementation.
-   void AttachFilter(cFilter *Filter);
-        ///< Attaches the given filter to this device.
-   void Detach(cFilter *Filter);
-diff -Nru vdr-1.4.7-vanilla/dvbdevice.c vdr-1.4.7-closefilter/dvbdevice.c
--- vdr-1.4.7-vanilla/dvbdevice.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/dvbdevice.c	2007-10-27 01:37:50.000000000 +0300
-@@ -726,6 +726,11 @@
-   return -1;
- }
- 
-+void cDvbDevice::CloseFilter(int Handle)
-+{
-+  close(Handle);
-+}
-+
- void cDvbDevice::TurnOffLiveMode(bool LiveView)
- {
-   if (LiveView) {
-diff -Nru vdr-1.4.7-vanilla/dvbdevice.h vdr-1.4.7-closefilter/dvbdevice.h
--- vdr-1.4.7-vanilla/dvbdevice.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/dvbdevice.h	2007-10-27 01:37:59.000000000 +0300
-@@ -79,6 +79,7 @@
- 
- protected:
-   virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
-+  virtual void CloseFilter(int Handle);
- 
- // Image Grab facilities
- 
-diff -Nru vdr-1.4.7-vanilla/sections.c vdr-1.4.7-closefilter/sections.c
--- vdr-1.4.7-vanilla/sections.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-closefilter/sections.c	2007-10-27 01:34:06.000000000 +0300
-@@ -105,7 +105,7 @@
-   for (fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) {
-       if (fh->filterData.Is(FilterData->pid, FilterData->tid, FilterData->mask)) {
-          if (--fh->used <= 0) {
-            close(fh->handle);
-+            device->CloseFilter(fh->handle);
-             filterHandles.Del(fh);
-             break;
-             }
--- a/patches/vdr-1.4.7-pluginparam.patch
+++ b/patches/vdr-1.4.7-pluginparam.patch
@@ -1,299 +0,0 @@
-diff -Nru vdr-1.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c
--- vdr-1.4.7-vanilla/channels.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/channels.c	2007-10-27 01:09:05.000000000 +0300
-@@ -166,6 +166,7 @@
-   shortName = strdup("");
-   provider = strdup("");
-   portalName = strdup("");
-+  pluginParam = strdup("");
-   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-   inversion    = INVERSION_AUTO;
-   bandwidth    = BANDWIDTH_AUTO;
-@@ -187,6 +188,7 @@
-   shortName = NULL;
-   provider = NULL;
-   portalName = NULL;
-+  pluginParam = NULL;
-   schedule     = NULL;
-   linkChannels = NULL;
-   refChannel   = NULL;
-@@ -215,6 +217,7 @@
-   free(shortName);
-   free(provider);
-   free(portalName);
-+  free(pluginParam);
- }
- 
- cChannel& cChannel::operator= (const cChannel &Channel)
-@@ -223,6 +226,7 @@
-   shortName = strcpyrealloc(shortName, Channel.shortName);
-   provider = strcpyrealloc(provider, Channel.provider);
-   portalName = strcpyrealloc(portalName, Channel.portalName);
-+  pluginParam = strcpyrealloc(pluginParam, Channel.pluginParam);
-   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
-   return *this;
- }
-@@ -280,9 +284,26 @@
-      transmission = Channel->transmission;
-      guard        = Channel->guard;
-      hierarchy    = Channel->hierarchy;
-+     if (IsPlug())  pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam);
-      }
- }
- 
-+bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam)
-+{
-+  if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) {
-+       if (Number()) {
-+          dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *cSource::ToString(source), frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam);
-+          modification |= CHANNELMOD_TRANSP;
-+          Channels.SetModified();
-+          }
-+       source = Source;
-+       frequency = Frequency;
-+       pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+       schedule = NULL;
-+       }
-+    return true;
-+}
-+
- bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
- {
-   // Workarounds for broadcaster stupidity:
-@@ -407,6 +428,18 @@
-      }
- }
- 
-+void cChannel::SetPluginParam(const char *PluginParam)
-+{
-+  if (!isempty(PluginParam) && strcmp(pluginParam, PluginParam) != 0) {
-+     if (Number()) {
-+        dsyslog("changing plugin parameters of channel %d from '%s' to '%s'", Number(), pluginParam, PluginParam);
-+        modification |= CHANNELMOD_TRANSP;
-+        Channels.SetModified();
-+        }
-+     pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+     }
-+}
-+
- #define STRDIFF 0x01
- #define VALDIFF 0x02
- 
-@@ -579,7 +612,7 @@
-   if (isdigit(type))
-      type = 'S';
- #define ST(s) if (strchr(s, type))
-  char buffer[64];
-+  char buffer[256];
-   char *q = buffer;
-   *q = 0;
-   ST(" S ")  q += sprintf(q, "%c", polarization);
-@@ -591,6 +624,7 @@
-   ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
-   ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
-   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
-+  ST("P  ")  snprintf(buffer, sizeof(buffer), "%s", pluginParam);
-   return buffer;
- }
- 
-@@ -612,7 +646,7 @@
- 
- bool cChannel::StringToParameters(const char *s)
- {
-  while (s && *s) {
-+  while (s && *s && !IsPlug()) {
-         switch (toupper(*s)) {
-           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
-           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
-@@ -722,7 +756,7 @@
-         dpids[0] = 0;
-         ok = false;
-         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
-           ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
-+           ok = ((source = cSource::FromString(sourcebuf)) >= 0) && StringToParameters(parambuf);
- 
-            char *p = strchr(vpidbuf, '+');
-            if (p)
-@@ -813,6 +847,7 @@
-            shortName = strcpyrealloc(shortName, p);
-            }
-         name = strcpyrealloc(name, namebuf);
-+        if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, parambuf);
- 
-         free(parambuf);
-         free(sourcebuf);
-diff -Nru vdr-1.4.7-vanilla/channels.h vdr-1.4.7-pluginparam/channels.h
--- vdr-1.4.7-vanilla/channels.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/channels.h	2007-10-27 01:12:37.000000000 +0300
-@@ -114,6 +114,7 @@
-   char *shortName;
-   char *provider;
-   char *portalName;
-+  char *pluginParam;
-   int __BeginData__;
-   int frequency; // MHz
-   int source;
-@@ -165,6 +166,7 @@
-   int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
-   int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
-   static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
-+  const char *PluginParam(void) const { return pluginParam; }
-   int Source(void) const { return source; }
-   int Srate(void) const { return srate; }
-   int Vpid(void) const { return vpid; }
-@@ -198,6 +200,7 @@
-   int Hierarchy(void) const { return hierarchy; }
-   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
-   const cChannel *RefChannel(void) const { return refChannel; }
-+  bool IsPlug(void) const { return cSource::IsPlug(source); }
-   bool IsCable(void) const { return cSource::IsCable(source); }
-   bool IsSat(void) const { return cSource::IsSat(source); }
-   bool IsTerr(void) const { return cSource::IsTerr(source); }
-@@ -205,12 +208,14 @@
-   bool HasTimer(void) const;
-   int Modification(int Mask = CHANNELMOD_ALL);
-   void CopyTransponderData(const cChannel *Channel);
-+  bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam);
-   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
-   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
-   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
-   void SetName(const char *Name, const char *ShortName, const char *Provider);
-   void SetPortalName(const char *PortalName);
-+  void SetPluginParam(const char *PluginParam);
-   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid);
-   void SetCaIds(const int *CaIds); // list must be zero-terminated
-   void SetCaDescriptors(int Level);
-diff -Nru vdr-1.4.7-vanilla/config.h vdr-1.4.7-pluginparam/config.h
--- vdr-1.4.7-vanilla/config.h	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/config.h	2007-10-27 01:14:39.000000000 +0300
-@@ -29,6 +29,8 @@
- #define APIVERSION  "1.4.5"
- #define APIVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
- 
-+#define PLUGINPARAMPATCHVERSNUM 1
-+
- // When loading plugins, VDR searches them by their APIVERSION, which
- // may be smaller than VDRVERSION in case there have been no changes to
- // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.4.7-vanilla/i18n.c vdr-1.4.7-pluginparam/i18n.c
--- vdr-1.4.7-vanilla/i18n.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/i18n.c	2007-10-27 01:11:38.000000000 +0300
-@@ -6126,6 +6126,28 @@
-     "Ingen titel",
-     "Bez n<>zvu",
-   },
-+  { "Parameters",
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "Parametrit",
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+    "",// TODO
-+  },
-   { NULL }
-   };
- 
-diff -Nru vdr-1.4.7-vanilla/menu.c vdr-1.4.7-pluginparam/menu.c
--- vdr-1.4.7-vanilla/menu.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/menu.c	2007-10-27 01:09:05.000000000 +0300
-@@ -216,6 +216,7 @@
-   cChannel *channel;
-   cChannel data;
-   char name[256];
-+  char pluginParam[256];
-   void Setup(void);
- public:
-   cMenuEditChannel(cChannel *Channel, bool New = false);
-@@ -248,6 +249,7 @@
- 
-   // Parameters for all types of sources:
-   strn0cpy(name, data.name, sizeof(name));
-+  strn0cpy(pluginParam, data.pluginParam, sizeof(pluginParam));
-   Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name), tr(FileNameChars)));
-   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
-   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
-@@ -276,6 +278,7 @@
-   ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
-   ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
-   ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues, tr("none")));
-+  ST("P  ")  Add(new cMenuEditStrItem( tr("Parameters"),    pluginParam, sizeof(pluginParam), tr(FileNameChars)));
- 
-   SetCurrent(Get(current));
-   Display();
-@@ -290,6 +293,7 @@
-      if (Key == kOk) {
-         if (Channels.HasUniqueChannelID(&data, channel)) {
-            data.name = strcpyrealloc(data.name, name);
-+           data.pluginParam = strcpyrealloc(data.pluginParam, pluginParam);
-            if (channel) {
-               *channel = data;
-               isyslog("edited channel %d %s", channel->Number(), *data.ToText());
-diff -Nru vdr-1.4.7-vanilla/sources.c vdr-1.4.7-pluginparam/sources.c
--- vdr-1.4.7-vanilla/sources.c	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/sources.c	2007-10-27 01:09:20.000000000 +0300
-@@ -37,6 +37,7 @@
-   char buffer[16];
-   char *q = buffer;
-   switch (Code & st_Mask) {
-+    case stPlug:  *q++ = 'P'; break;
-     case stCable: *q++ = 'C'; break;
-     case stSat:   *q++ = 'S';
-                   {
-@@ -56,6 +57,7 @@
- {
-   int type = stNone;
-   switch (toupper(*s)) {
-+    case 'P': type = stPlug;  break;
-     case 'C': type = stCable; break;
-     case 'S': type = stSat;   break;
-     case 'T': type = stTerr;  break;
-diff -Nru vdr-1.4.7-vanilla/sources.conf vdr-1.4.7-pluginparam/sources.conf
--- vdr-1.4.7-vanilla/sources.conf	2007-10-27 01:08:39.000000000 +0300
-+++ vdr-1.4.7-pluginparam/sources.conf	2007-10-27 01:09:20.000000000 +0300
-@@ -188,3 +188,7 @@
- # Terrestrial
- 
- T       Terrestrial
-+
-+# Plugin
-+
-+P       Plugin
-diff -Nru vdr-1.4.7-vanilla/sources.h vdr-1.4.7-pluginparam/sources.h
--- vdr-1.4.7-vanilla/sources.h	2007-10-27 01:08:40.000000000 +0300
-+++ vdr-1.4.7-pluginparam/sources.h	2007-10-27 01:09:20.000000000 +0300
-@@ -16,10 +16,11 @@
- public:
-   enum eSourceType {
-     stNone  = 0x0000,
-+    stPlug  = 0x2000,
-     stCable = 0x4000,
-     stSat   = 0x8000,
-     stTerr  = 0xC000,
-    st_Mask = 0xC000,
-+    st_Mask = 0xE000,
-     st_Neg  = 0x0800,
-     st_Pos  = 0x07FF,
-     };
-@@ -35,6 +36,7 @@
-   static cString ToString(int Code);
-   static int FromString(const char *s);
-   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
-+  static bool IsPlug(int Code) { return (Code & st_Mask) == stPlug; }
-   static bool IsCable(int Code) { return (Code & st_Mask) == stCable; }
-   static bool IsSat(int Code) { return (Code & st_Mask) == stSat; }
-   static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; }
--- a/patches/vdr-1.5.10-pluginparam.patch
+++ b/patches/vdr-1.5.10-pluginparam.patch
@@ -1,277 +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-27 01:53:27.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-27 01:53:27.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/config.h vdr-1.5.10-pluginparam/config.h
--- vdr-1.5.10-vanilla/config.h	2007-10-14 18:21:57.000000000 +0300
-+++ vdr-1.5.10-pluginparam/config.h	2007-10-27 01:53:59.000000000 +0300
-@@ -30,6 +30,8 @@
- #define APIVERSION  "1.5.10"
- #define APIVERSNUM   10510  // Version * 10000 + Major * 100 + Minor
- 
-+#define PLUGINPARAMPATCHVERSNUM 1
-+
- // When loading plugins, VDR searches them by their APIVERSION, which
- // may be smaller than VDRVERSION in case there have been no changes to
- // VDR header files since the last APIVERSION. This allows compiled
-diff -Nru vdr-1.5.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-27 01:53:27.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-27 01:53:27.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-27 01:53:27.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-27 01:53:27.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-27 01:53:27.000000000 +0300
-@@ -16,10 +16,11 @@
- public:
-   enum eSourceType {
-     stNone  = 0x0000,
-+    stPlug  = 0x2000,
-     stCable = 0x4000,
-     stSat   = 0x8000,
-     stTerr  = 0xC000,
-    st_Mask = 0xC000,
-+    st_Mask = 0xE000,
-     st_Neg  = 0x0800,
-     st_Pos  = 0x07FF,
-     };
-@@ -35,6 +36,7 @@
-   static cString ToString(int Code);
-   static int FromString(const char *s);
-   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
-+  static bool IsPlug(int Code) { return (Code & st_Mask) == stPlug; }
-   static bool IsCable(int Code) { return (Code & st_Mask) == stCable; }
-   static bool IsSat(int Code) { return (Code & st_Mask) == stSat; }
-   static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; }
--- a/patches/vdr-1.7.27-disable_ca_updates.patch
+++ b/patches/vdr-1.7.27-disable_ca_updates.patch
@@ -0,0 +1,11 @@
+diff -Nru vdr-1.7.27-vanilla/pat.c vdr-1.7.27-disable_ca_updates/pat.c
+--- vdr-1.7.27-vanilla/pat.c	2012-03-25 15:17:57.000000000 +0300
+++ vdr-1.7.27-disable_ca_updates/pat.c	2012-03-31 20:42:14.000000000 +0300
+@@ -537,6 +537,7 @@
+             }
+         if (Setup.UpdateChannels >= 2) {
+            Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
+           if (!cSource::IsType(Channel->Source(), 'I'))
+            Channel->SetCaIds(CaDescriptors->CaIds());
+            Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
+            }
--- a/pidscanner.c
+++ b/pidscanner.c
@@ -0,0 +1,158 @@
+/*
+ * 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),
+  channelId(tChannelID::InvalidID),
+  process(true),
+  Vpid(0xFFFF),
+  Apid(0xFFFF),
+  numVpids(0),
+  numApids(0)
+{
+  debug("cPidScanner::cPidScanner()\n");
+}
+
+cPidScanner::~cPidScanner()
+{
+  debug("cPidScanner::~cPidScanner()\n");
+}
+
+void cPidScanner::SetChannel(const tChannelID &ChannelId)
+{
+  debug("cPidScanner::SetChannel(): %s\n", *ChannelId.ToString());
+  channelId = ChannelId;
+  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(channelId);
+           if (IptvChannel) {
+              int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
+              int Atypes[MAXAPIDS + 1] = { 0 };
+              int Dpids[MAXDPIDS + 1] = { 0 };
+              int Dtypes[MAXDPIDS + 1] = { 0 };
+              int Spids[MAXSPIDS + 1] = { 0 };
+              char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
+              char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
+              char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
+              int Vtype = IptvChannel->Vtype();
+              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 = 0; i < MAXAPIDS; ++i) {
+                  Apids[i] = IptvChannel->Apid(i);
+                  Atypes[i] = IptvChannel->Atype(i);
+                  if (Apids[i] && (Apids[i] == Apid))
+                     foundApid = true;
+                  }
+              if (!foundApid) {
+                 Apids[0] = Apid;
+                 Atypes[0] = 4;
+                 }
+              for (unsigned int i = 0; i < MAXDPIDS; ++i) {
+                  Dpids[i] = IptvChannel->Dpid(i);
+                  Dtypes[i] = IptvChannel->Dtype(i);
+                  }
+              for (unsigned int i = 0; i < MAXSPIDS; ++i)
+                  Spids[i] = IptvChannel->Spid(i);
+              debug("cPidScanner::Process(): Vpid=0x%04X, Apid=0x%04X\n", Vpid, Apid);
+              IptvChannel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
+              }
+           Channels.Unlock();
+           process = false;
+           }
+        }
+     }
+}
--- a/pidscanner.h
+++ b/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;
+  tChannelID channelId;
+  bool process;
+  int Vpid;
+  int Apid;
+  int numVpids;
+  int numApids;
+
+public:
+  cPidScanner(void);
+  ~cPidScanner();
+  void SetChannel(const tChannelID &ChannelId);
+  void Process(const uint8_t* buf);
+};
+
+#endif // __PIDSCANNER_H
--- a/po/de_DE.po
+++ b/po/de_DE.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.
+# Tobias <vdr@e-tobi.net>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-06-03 06:03+0300\n"
+"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"Last-Translator: Tobias Grimm <tg@e-tobi.net>\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\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 section ids"
+msgstr "Scanne Section IDS"
+
+msgid "Scan pids"
+msgstr "Scanne PIDS"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Parameter"
+msgstr "Parameter"
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,18 +1,19 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
+# Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
+# This file is distributed under the same license as the iptv package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-10-20 19:43+0300\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-06-03 06:03+0300\n"
+"PO-Revision-Date: 2012-06-03 06:03+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\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,51 +40,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 "EXT"
-msgstr "EXT"
-
-msgid "Protocol"
-msgstr "Protokolla"
-
-msgid "Delay (ms)"
-msgstr "Viive (ms)"
-
-msgid "Script"
-msgstr "Skripti"
-
-msgid "Parameter"
-msgstr "Parametri"
-
-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"

@@ -105,21 +61,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 "Use section filtering"
-msgstr "K<>yt<79> sektioiden suodatusta"
+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 "Scan Sid automatically"
-msgstr "Etsi palvelu-ID automaattisesti"
+msgid "Use section filtering"
+msgstr "Käytä sektioiden suodatusta"
+
+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 ""
+"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 section ids"
+msgstr "Etsi sektiotunnisteet"
+
+msgid "Scan pids"
+msgstr "Etsi pidit"
+
+msgid "Protocol"
+msgstr "Protokolla"
+
+msgid "Address"
+msgstr "Osoite"
+
+msgid "Parameter"
+msgstr "Parametri"
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -0,0 +1,169 @@
+# 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: vdr-iptv 1.0.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-06-03 06:03+0300\n"
+"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\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 section ids"
+msgstr "Scanne les section ID"
+
+msgid "Scan pids"
+msgstr "Scanne les PID"
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Parameter"
+msgstr "Paramètre"
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -0,0 +1,168 @@
+# 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: vdr-iptv 1.0.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-06-03 06:03+0300\n"
+"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\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 section ids"
+msgstr "Scansione Section Ids"
+
+msgid "Scan pids"
+msgstr "Scansione Pids"
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid "Address"
+msgstr "Indirizzo"
+
+msgid "Parameter"
+msgstr "Parametro"
--- a/po/nl_NL.po
+++ b/po/nl_NL.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.
+# Carel, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-iptv 1.0.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-06-03 06:03+0300\n"
+"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"Last-Translator: Carel\n"
+"Language-Team: Dutch <vdr@linuxtv.org>\n"
+"Language: nl\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 section ids"
+msgstr "Scan section IDS"
+
+msgid "Scan pids"
+msgstr "Scan PIDS"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "Parameter"
+msgstr "Parameter"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -0,0 +1,153 @@
+# 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: vdr-iptv 1.0.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-06-03 06:03+0300\n"
+"PO-Revision-Date: 2012-06-03 06:03+0300\n"
+"Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\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 section ids"
+msgstr "Сканировать section ids"
+
+msgid "Scan pids"
+msgstr "Сканировать пиды"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Parameter"
+msgstr "Параметр"
--- a/po2i18n.pl
+++ b/po2i18n.pl
@@ -1,156 +0,0 @@
-#!/usr/bin/perl
-#
-#  po2i18n - Convert plugin po files in into i18n.c-format
-#
-#  See the README file for copyright information and how to reach the author.
-#
-
-use strict;
-use warnings;
-
-my @LANGS = (
-  "en_US",
-  "de_DE",
-  "sl_SI",
-  "it_IT",
-  "nl_NL",
-  "pt_PT",
-  "fr_FR",
-  "nn_NO",
-  "fi_FI",
-  "pl_PL",
-  "es_ES",
-  "el_GR",
-  "sv_SE",
-  "ro_RO",
-  "hu_HU",
-  "ca_ES",
-  "ru_RU",
-  "hr_HR",
-  "et_EE",
-  "da_DK",
-  "cs_CZ",
-  "tr_TR"
-  );
-
-my %VERS = (
-  "en_US" => 10200,
-  "de_DE" => 10200,
-  "sl_SI" => 10200,
-  "it_IT" => 10200,
-  "nl_NL" => 10200,
-  "pt_PT" => 10200,
-  "fr_FR" => 10200,
-  "nn_NO" => 10200,
-  "fi_FI" => 10200,
-  "pl_PL" => 10200,
-  "es_ES" => 10200,
-  "el_GR" => 10200,
-  "sv_SE" => 10200,
-  "ro_RO" => 10200,
-  "hu_HU" => 10200,
-  "ca_ES" => 10200,
-  "ru_RU" => 10302,
-  "hr_HR" => 10307,
-  "et_EE" => 10313,
-  "da_DK" => 10316,
-  "cs_CZ" => 10342,
-  "tr_TR" => 10502
-  );
-
-
-my %strings;
-
-foreach my $lang (@LANGS) { $strings{$lang} = { }; }
-
-
-sub LoadLanguage(*) {
-    my ($lang) = @_;
-    
-    if (!open FILE, "<", "po/$lang.po") {
-        return 0;   
-    }
-    
-    my $msgid = "";
-    my $msgstr = "";
-    my $last = 0; # 0=init, 1=msgid was last, 2=msgstr was last
-    
-    while (<FILE>) {
-        chomp;
-        my $line = $_;
-        
-        if ($line =~ /^msgid "(.*)"$/) {
-            if ($last eq 2) {
-                $strings{$lang}->{$msgid} = $msgstr;
-                $strings{"en_US"}->{$msgid} = $msgid;
-            }
-            $msgid = $1;
-            $last = 1;
-        } elsif ($line =~ /^msgstr "(.*)"/) {
-            $msgstr = $1;
-            $last = 2;
-        } elsif ($line =~ /^"(.*)"/) {
-            if ($last eq 1) {
-                $msgid = $msgid . $1;
-            } elsif ($last eq 2) {
-                $msgstr = $msgstr . $1;
-            }
-        }       
-    }
-    if ($last eq 2) {
-        $strings{$lang}->{$msgid} = $msgstr;
-        $strings{"en_US"}->{$msgid} = $msgid;
-    }
-    
-    close FILE;
-}
-
-
-
-foreach my $lang (@LANGS) { 
-    LoadLanguage($lang);
-}
-
-my @msgids = sort keys %{$strings{"en_US"}};
-
-
-my $silent = 0;
-
-while (<>) {
-    my $line = $_;
-
-    if ($line =~ /^\/\/ START I18N/) {
-        print "// START I18N - automatically generated by po2i18n.pl\n";
-        for my $msgid (@msgids) {
-            next if $msgid eq "";
-
-            my $head = "  { ";
-            my $endif = "";
-            my $versnum = 10200;
-            
-            for my $lang (@LANGS) {
-                if ($VERS{$lang} ne $versnum) {
-                    $versnum = $VERS{$lang};
-                    print $endif;
-                    print "#if VDRVERSNUM >= $versnum\n";
-                    $endif = "#endif\n";
-                }
-                my $msgstr = $strings{$lang}->{$msgid};
-                $msgstr = "" if !defined $msgstr;
-                
-                print "$head\"$msgstr\",\n";
-                $head = "    ";
-            }
-            print $endif;
-            print "  },\n";
-        }
-        $silent = 1;
-    }
-
-    if (!$silent) { print $line; }
-
-    if ($line =~ /^\/\/ END I18N/) { 
-        print "// END I18N - automatically generated by po2i18n.pl\n";
-        $silent = 0; 
-    }    
-}
--- a/protocolext.c
+++ b/protocolext.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolext.c,v 1.20 2007/10/21 19:32:14 ajhseppa Exp $
 */

 #include <sys/wait.h>
@@ -20,31 +19,34 @@
 #include "config.h"
 #include "protocolext.h"

+#ifndef EXTSHELL
+#define EXTSHELL "/bin/bash"
+#endif
+
 cIptvProtocolExt::cIptvProtocolExt()
 : pid(-1),
-  scriptParameter(0)
+  scriptFile(""),
+  scriptParameter(0),
+  streamPort(0)
 {
  debug("cIptvProtocolExt::cIptvProtocolExt()\n");
-  scriptFile = strdup("");
-  listenAddr = strdup("127.0.0.1");
 }

 cIptvProtocolExt::~cIptvProtocolExt()
 {
  debug("cIptvProtocolExt::~cIptvProtocolExt()\n");
  // Drop the socket connection
-  Close();
-  // Free allocated memory
-  free(scriptFile);
-  free(listenAddr);
+  cIptvProtocolExt::Close();
 }

 void cIptvProtocolExt::ExecuteScript(void)
 {
  debug("cIptvProtocolExt::ExecuteScript()\n");
  // Check if already executing
+  if (isActive || isempty(scriptFile))
+     return;
  if (pid > 0) {
-     error("ERROR: Cannot execute script!");
+     error("Cannot execute script!");
     return;
     }
  // Let's fork
@@ -56,15 +58,14 @@ void cIptvProtocolExt::ExecuteScript(void)
     for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
         close(i);
     // Execute the external script
-     char* cmd = NULL;
-     asprintf(&cmd, "%s %d %d", scriptFile, scriptParameter, socketPort);
-     debug("cIptvProtocolExt::ExecuteScript(child): %s\n", cmd);
-     if (execl("/bin/sh", "sh", "-c", cmd, NULL) == -1) {
-        error("ERROR: Script executionfailed: %s", cmd);
-        free(cmd);
+     cString cmd = cString::sprintf("%s %d %d", *scriptFile, scriptParameter, streamPort);
+     debug("cIptvProtocolExt::ExecuteScript(child): %s\n", *cmd);
+     // Create a new session for a process group
+     ERROR_IF_RET(setsid() == -1, "setsid()", _exit(-1));
+     if (execl(EXTSHELL, "sh", "-c", *cmd, (char *)NULL) == -1) {
+        error("Script execution failed: %s", *cmd);
        _exit(-1);
        }
-     free(cmd);
     _exit(0);
     }
  else {
@@ -75,30 +76,41 @@ void cIptvProtocolExt::ExecuteScript(void)
 void cIptvProtocolExt::TerminateScript(void)
 {
  debug("cIptvProtocolExt::TerminateScript(): pid=%d\n", pid);
+  if (!isActive || isempty(scriptFile))
+     return;
  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);
+     // Signal and wait for termination
+     int retval = killpg(pid, SIGINT);
     ERROR_IF_RET(retval < 0, "kill()", waitOver = true);
     while (!waitOver) {
       retval = 0;
       waitms += timeoutms;
       if ((waitms % 2000) == 0) {
-          error("ERROR: Script '%s' won't terminate - killing it!", scriptFile);
-          kill(pid, SIGKILL);
+          error("Script '%s' won't terminate - killing it!", *scriptFile);
+          killpg(pid, SIGKILL);
          }
       // Clear wait status to make sure child exit status is accessible
+       // and wait for child termination
+#ifdef __FreeBSD__
+       int waitStatus = 0;
+       retval = waitpid(pid, &waitStatus, WNOHANG);
+#else  // __FreeBSD__
+       siginfo_t waitStatus;
       memset(&waitStatus, '\0', sizeof(waitStatus));
-       // Wait for child termination
       retval = waitid(P_PID, pid, &waitStatus, (WNOHANG | WEXITED));
+#endif // __FreeBSD__
       ERROR_IF_RET(retval < 0, "waitid()", waitOver = true);
       // These are the acceptable conditions under which child exit is
       // regarded as successful
+#ifdef __FreeBSD__
+       if (retval > 0 && (WIFEXITED(waitStatus) || WIFSIGNALED(waitStatus))) {
+#else  // __FreeBSD__
       if (!retval && waitStatus.si_pid && (waitStatus.si_pid == pid) &&
          ((waitStatus.si_code == CLD_EXITED) || (waitStatus.si_code == CLD_KILLED))) {
+#endif // __FreeBSD__
          debug("Child (%d) exited as expected\n", pid);
          waitOver = true;
          }
@@ -114,10 +126,10 @@ bool cIptvProtocolExt::Open(void)
 {
  debug("cIptvProtocolExt::Open()\n");
  // Reject empty script files
-  if (!strlen(scriptFile))
-      return false;
+  if (!strlen(*scriptFile))
+     return false;
  // Create the listening socket
-  OpenSocket(socketPort);
+  OpenSocket(streamPort);
  // Execute the external script
  ExecuteScript();
  isActive = true;
@@ -127,17 +139,17 @@ bool cIptvProtocolExt::Open(void)
 bool cIptvProtocolExt::Close(void)
 {
  debug("cIptvProtocolExt::Close()\n");
-  // Close the socket
-  CloseSocket();
  // Terminate the external script
  TerminateScript();
  isActive = false;
+  // Close the socket
+  CloseSocket();
  return true;
 }

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

 bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int Index)
@@ -146,15 +158,14 @@ bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int
  if (!isempty(Location)) {
     struct stat stbuf;
     // Update script file and parameter
-     free(scriptFile);
-     asprintf(&scriptFile, "%s/%s", IptvConfig.GetConfigDirectory(), Location);
-     if ((stat(scriptFile, &stbuf) != 0) || (strstr(scriptFile, "..") != 0)) {
-        error("ERROR: Non-existent or relative path script '%s'", scriptFile);
+     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;
+     streamPort = IptvConfig.GetExtProtocolBasePort() + Index;
     }
  return true;
 }
@@ -162,5 +173,5 @@ bool cIptvProtocolExt::Set(const char* Location, const int Parameter, const int
 cString cIptvProtocolExt::GetInformation(void)
 {
  //debug("cIptvProtocolExt::GetInformation()");
-  return cString::sprintf("ext://%s:%d", scriptFile, scriptParameter);
+  return cString::sprintf("ext://%s:%d", *scriptFile, scriptParameter);
 }
--- a/protocolext.h
+++ b/protocolext.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolext.h,v 1.8 2007/10/21 17:32:43 ajhseppa Exp $
 */

 #ifndef __IPTV_PROTOCOLEXT_H
@@ -16,9 +15,9 @@
 class cIptvProtocolExt : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
  int pid;
-  char* listenAddr;
-  char* scriptFile;
+  cString scriptFile;
  int scriptParameter;
+  int streamPort;

 private:
  void TerminateScript(void);
@@ -27,11 +26,11 @@ private:
 public:
  cIptvProtocolExt();
  virtual ~cIptvProtocolExt();
-  int Read(unsigned char* *BufferAddr);
-  virtual bool Set(const char* Location, const int Parameter, const int Index);
-  virtual bool Open(void);
-  virtual bool Close(void);
-  virtual cString GetInformation(void);
+  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
--- a/protocolfile.c
+++ b/protocolfile.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolfile.c,v 1.14 2007/10/20 23:25:14 ajhseppa Exp $
 */

 #include <fcntl.h>
@@ -17,25 +16,20 @@

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

 cIptvProtocolFile::~cIptvProtocolFile()
 {
  debug("cIptvProtocolFile::~cIptvProtocolFile()\n");
  // Drop open handles
-  Close();
+  cIptvProtocolFile::Close();
  // Free allocated memory
  free(fileLocation);
-  free(readBuffer);
 }

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

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

--- a/protocolfile.h
+++ b/protocolfile.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolfile.h,v 1.7 2007/10/19 22:18:55 rahrenbe Exp $
 */

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

 private:
@@ -28,11 +25,11 @@ private:
 public:
  cIptvProtocolFile();
  virtual ~cIptvProtocolFile();
-  virtual int Read(unsigned char* *BufferAddr);
-  virtual bool Set(const char* Location, const int Parameter, const int Index);
-  virtual bool Open(void);
-  virtual bool Close(void);
-  virtual cString GetInformation(void);
+  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_PROTOCOLFILE_H
--- a/protocolhttp.c
+++ b/protocolhttp.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolhttp.c,v 1.21 2007/10/21 19:46:03 rahrenbe Exp $
 */

 #include <sys/types.h>
@@ -20,21 +19,21 @@
 #include "protocolhttp.h"

 cIptvProtocolHttp::cIptvProtocolHttp()
+: streamAddr(strdup("")),
+  streamPath(strdup("/")),
+  streamPort(0)
 {
  debug("cIptvProtocolHttp::cIptvProtocolHttp()\n");
-  streamAddr = strdup("");
-  streamPath = strdup("/");
 }

 cIptvProtocolHttp::~cIptvProtocolHttp()
 {
  debug("cIptvProtocolHttp::~cIptvProtocolHttp()\n");
  // Close the socket
-  Close();
+  cIptvProtocolHttp::Close();
  // Free allocated memory
  free(streamPath);
  free(streamAddr);
-
 }

 bool cIptvProtocolHttp::Connect(void)
@@ -42,72 +41,29 @@ bool cIptvProtocolHttp::Connect(void)
  debug("cIptvProtocolHttp::Connect()\n");
  // Check that stream address is valid
  if (!isActive && !isempty(streamAddr) && !isempty(streamPath)) {
-     // Ensure that socket is valid
-     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);
-
-        // It may be a host name, get the name
-        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)));
-           return false;
-           }
-
-        sockAddr.sin_addr.s_addr = inet_addr(*host->h_addr_list);
-        }
-
-     int err = connect(socketDesc, (struct sockaddr*)&sockAddr,
-		       sizeof(sockAddr));
-     // Non-blocking sockets always report in-progress error when connected
-     ERROR_IF_FUNC(err < 0 && errno != EINPROGRESS, "connect()", CloseSocket(), return false);
-     // Select with 800ms timeout on the socket completion, check if it is writable
-     int retval = select_single_desc(socketDesc, 800000, true);
-     if (retval < 0)
-        return retval;
-
-     // Select has returned. Get socket errors if there are any
-     int socketStatus = 0;
-     socklen_t len = sizeof(socketStatus);
-     getsockopt(socketDesc, SOL_SOCKET, SO_ERROR, &socketStatus, &len);
-
-     // 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)));
+     // Ensure that socket is valid and connect
+     OpenSocket(streamPort, streamAddr);
+     if (!ConnectSocket()) {
        CloseSocket();
        return false;
        }
-
     // Formulate and send HTTP request
-     char buffer[256];
-     memset(buffer, '\0', sizeof(buffer));
-     snprintf(buffer, sizeof(buffer),
-	      "GET %s HTTP/1.1\r\n"
-	      "Host: %s\r\n"
-	      "User-Agent: vdr-iptv\r\n"
-	      "Range: bytes=0-\r\n"
-	      "Connection: Close\r\n"
-	      "\r\n", streamPath, streamAddr);
-
-     //debug("Sending http request: %s\n", buffer);
-     err = send(socketDesc, buffer, strlen(buffer), 0);
-     ERROR_IF_FUNC(err < 0, "send()", CloseSocket(), return false);
-
+     cString buffer = cString::sprintf("GET %s HTTP/1.1\r\n"
+                                       "Host: %s\r\n"
+                                       "User-Agent: vdr-%s/%s\r\n"
+                                       "Range: bytes=0-\r\n"
+                                       "Connection: Close\r\n"
+                                       "\r\n", streamPath, streamAddr, PLUGIN_NAME_I18N, VERSION);
+     debug("Sending http request: %s\n", *buffer);
+     if (!Write(*buffer, (unsigned int)strlen(*buffer))) {
+        CloseSocket();
+        return false;
+        }
     // Now process headers
     if (!ProcessHeaders()) {
        CloseSocket();
        return false;
        }
-
     // Update active flag
     isActive = true;
     }
@@ -117,40 +73,30 @@ bool cIptvProtocolHttp::Connect(void)
 bool cIptvProtocolHttp::Disconnect(void)
 {
  debug("cIptvProtocolHttp::Disconnect()\n");
-  // Check that stream address is valid
  if (isActive) {
-      // Close the socket
-      CloseSocket();
-      // Update active flag
-      isActive = false;
+     // Close the socket
+     CloseSocket();
+     // Update active flag
+     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 *bufptr = buf;
-  memset(buf, '\0', sizeof(buf));
+  char *bufptr = dest;
  recvLen = 0;

+  if (!dest)
+     return false;
+
  while (!newline || !linefeed) {
-    socklen_t addrlen = sizeof(sockAddr);
    // Wait 500ms for data
-    int retval = select_single_desc(socketDesc, 500000, false);
-    // Check if error
-    if (retval < 0)
-       return false;
-    // Check if data available
-    else if (retval) {
-       int retval = recvfrom(socketDesc, bufptr, 1, MSG_DONTWAIT,
-                             (struct sockaddr *)&sockAddr, &addrlen);
-       if (retval <= 0)
-          return false;
+    if (ReadChar(bufptr, 500)) {
       // Parsing end conditions, if line ends with \r\n
       if (linefeed && *bufptr == '\n')
          newline = true;
@@ -163,18 +109,18 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
          ++recvLen;
          }
       ++bufptr;
-       // Check that buffers won't be exceeded
-       if (recvLen >= sizeof(buf) || recvLen >= destLen) {
+       // Check that buffer won't be exceeded
+       if (recvLen >= destLen) {
          error("Header wouldn't fit into buffer\n");
+          recvLen = 0;
          return false;
          }
       }
    else {
-       error("No HTTP response received\n");
+       error("No HTTP response received in 500ms\n");
       return false;
       }
    }
-  memcpy(dest, buf, recvLen);
  return true;
 }

@@ -182,22 +128,27 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
 {
  debug("cIptvProtocolHttp::ProcessHeaders()\n");
  unsigned int lineLength = 0;
-  int response = 0;
+  int version = 0, response = 0;
  bool responseFound = false;
-  char buf[256];
+  char fmt[32];
+  char buf[4096];
+
+  // Generate HTTP response format string with 2 arguments
+  snprintf(fmt, sizeof(fmt), "HTTP/1.%%%zui %%%zui ", sizeof(version) - 1, sizeof(response) - 1);

  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, fmt, &version, &response) != 2) {
       error("Expected HTTP header not found\n");
       continue;
       }
    else
       responseFound = true;
-    if (response != 200) {
-       error("ERROR: %s\n", buf);
+    // Allow only 'OK' and 'Partial Content'
+    if ((response != 200) && (response != 206)) {
+       error("Invalid HTTP response (%d): %s\n", response, buf);
       return false;
       }
    }
@@ -219,36 +170,36 @@ bool cIptvProtocolHttp::Close(void)
  return true;
 }

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

 bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int Index)
 {
  debug("cIptvProtocolHttp::Set(): Location=%s Parameter=%d Index=%d\n", Location, Parameter, Index);
  if (!isempty(Location)) {
-    // Disconnect the current socket
-    Disconnect();
-    // Update stream address, path and port
-    streamAddr = strcpyrealloc(streamAddr, Location);
-    char *path = strstr(streamAddr, "/");
-    if (path) {
-       streamPath = strcpyrealloc(streamPath, path);
-       *path = 0;
-       }
-    else
-       streamPath = strcpyrealloc(streamPath, "/");
-    socketPort = Parameter;
-    debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
-    // Re-connect the socket
-    Connect();
-    }
+     // Disconnect the current socket
+     Disconnect();
+     // Update stream address, path and port
+     streamAddr = strcpyrealloc(streamAddr, Location);
+     char *path = strstr(streamAddr, "/");
+     if (path) {
+        streamPath = strcpyrealloc(streamPath, path);
+        *path = 0;
+        }
+     else
+        streamPath = strcpyrealloc(streamPath, "/");
+     streamPort = Parameter;
+     //debug("http://%s:%d%s\n", streamAddr, streamPort, streamPath);
+     // Re-connect the socket
+     Connect();
+     }
  return true;
 }

 cString cIptvProtocolHttp::GetInformation(void)
 {
  //debug("cIptvProtocolHttp::GetInformation()");
-  return cString::sprintf("http://%s:%d%s", streamAddr, socketPort, streamPath);
+  return cString::sprintf("http://%s:%d%s", streamAddr, streamPort, streamPath);
 }
--- a/protocolhttp.h
+++ b/protocolhttp.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolhttp.h,v 1.11 2007/10/21 17:32:43 ajhseppa Exp $
 */

 #ifndef __IPTV_PROTOCOLHTTP_H
@@ -17,22 +16,22 @@ class cIptvProtocolHttp : public cIptvTcpSocket, public cIptvProtocolIf {
 private:
  char* streamAddr;
  char* streamPath;
+  int streamPort;

 private:
  bool Connect(void);
  bool Disconnect(void);
-  bool GetHeaderLine(char* dest, unsigned int destLen,
-		     unsigned int &recvLen);
+  bool GetHeaderLine(char* dest, unsigned int destLen, unsigned int &recvLen);
  bool ProcessHeaders(void);

 public:
  cIptvProtocolHttp();
  virtual ~cIptvProtocolHttp();
-  int Read(unsigned char* *BufferAddr);
-  virtual bool Set(const char* Location, const int Parameter, const int Index);
-  virtual bool Open(void);
-  virtual bool Close(void);
-  virtual cString GetInformation(void);
+  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_PROTOCOLHTTP_H
--- a/protocolif.h
+++ b/protocolif.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocolif.h,v 1.7 2007/10/19 22:18:55 rahrenbe Exp $
 */

 #ifndef __IPTV_PROTOCOLIF_H
@@ -13,15 +12,15 @@ class cIptvProtocolIf {
 public:
  cIptvProtocolIf() {}
  virtual ~cIptvProtocolIf() {}
-  virtual int Read(unsigned char* *BufferAddr) = 0;
+  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen) = 0;
  virtual bool Set(const char* Location, const int Parameter, const int Index) = 0;
  virtual bool Open(void) = 0;
  virtual bool Close(void) = 0;
  virtual cString GetInformation(void) = 0;

 private:
-    cIptvProtocolIf(const cIptvProtocolIf&);
-    cIptvProtocolIf& operator=(const cIptvProtocolIf&);
+  cIptvProtocolIf(const cIptvProtocolIf&);
+  cIptvProtocolIf& operator=(const cIptvProtocolIf&);
 };

 #endif // __IPTV_PROTOCOLIF_H
--- a/protocoludp.c
+++ b/protocoludp.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocoludp.c,v 1.21 2007/10/21 19:32:15 ajhseppa Exp $
 */

 #include <sys/types.h>
@@ -20,100 +19,76 @@
 #include "socket.h"

 cIptvProtocolUdp::cIptvProtocolUdp()
+: streamAddr(strdup("")),
+  streamPort(0)
 {
  debug("cIptvProtocolUdp::cIptvProtocolUdp()\n");
-  streamAddr = strdup("");
 }

 cIptvProtocolUdp::~cIptvProtocolUdp()
 {
  debug("cIptvProtocolUdp::~cIptvProtocolUdp()\n");
  // Drop the multicast group and close the socket
-  Close();
+  cIptvProtocolUdp::Close();
  // Free allocated memory
  free(streamAddr);
 }

-bool cIptvProtocolUdp::JoinMulticast(void)
-{
-  debug("cIptvProtocolUdp::JoinMulticast()\n");
-  // Check that stream address is valid
-  if (!isActive && !isempty(streamAddr)) {
-     // Ensure that socket is valid
-     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));
-     ERROR_IF_RET(err < 0, "setsockopt()", return false);
-     // Update multicasting flag
-     isActive = true;
-     }
-  return true;
-}
-
-bool cIptvProtocolUdp::DropMulticast(void)
-{
-  debug("cIptvProtocolUdp::DropMulticast()\n");
-  // Check that stream address is valid
-  if (isActive && !isempty(streamAddr)) {
-      // Ensure that socket is valid
-      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));
-      ERROR_IF_RET(err < 0, "setsockopt()", return false);
-      // Update multicasting flag
-      isActive = false;
-     }
-  return true;
-}
-
 bool cIptvProtocolUdp::Open(void)
 {
-  debug("cIptvProtocolUdp::Open()\n");
-  // Join a new multicast group
-  JoinMulticast();
+  debug("cIptvProtocolUdp::Open(): streamAddr=%s\n", streamAddr);
+  OpenSocket(streamPort, inet_addr(streamAddr));
+  if (!isempty(streamAddr)) {
+     // Join a new multicast group
+     JoinMulticast();
+     }
  return true;
 }

 bool cIptvProtocolUdp::Close(void)
 {
-  debug("cIptvProtocolUdp::Close()\n");
-  // Drop the multicast group
-  DropMulticast();
+  debug("cIptvProtocolUdp::Close(): streamAddr=%s\n", streamAddr);
+  if (!isempty(streamAddr)) {
+     // Drop the multicast group
+     OpenSocket(streamPort, inet_addr(streamAddr));
+     DropMulticast();
+     }
  // Close the socket
  CloseSocket();
+  // Do NOT reset stream and source addresses
+  //streamAddr = strcpyrealloc(streamAddr, "");
+  //streamPort = 0;
  return true;
 }

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

 bool cIptvProtocolUdp::Set(const char* Location, const int Parameter, const int Index)
 {
  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, Location);
-    socketPort = Parameter;
-    // Join a new multicast group
-    JoinMulticast();
-    }
+     // Drop the multicast group
+     if (!isempty(streamAddr)) {
+        OpenSocket(streamPort, inet_addr(streamAddr));
+        DropMulticast();
+        }
+     // Update stream address and port
+     streamAddr = strcpyrealloc(streamAddr, Location);
+     streamPort = Parameter;
+     // Join a new multicast group
+     if (!isempty(streamAddr)) {
+        OpenSocket(streamPort, inet_addr(streamAddr));
+        JoinMulticast();
+        }
+     }
  return true;
 }

 cString cIptvProtocolUdp::GetInformation(void)
 {
  //debug("cIptvProtocolUdp::GetInformation()");
-  return cString::sprintf("udp://%s:%d", streamAddr, socketPort);
+  return cString::sprintf("udp://%s:%d", streamAddr, streamPort);
 }
--- a/protocoludp.h
+++ b/protocoludp.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: protocoludp.h,v 1.12 2007/10/21 17:32:43 ajhseppa Exp $
 */

 #ifndef __IPTV_PROTOCOLUDP_H
@@ -16,19 +15,16 @@
 class cIptvProtocolUdp : public cIptvUdpSocket, public cIptvProtocolIf {
 private:
  char* streamAddr;
-
-private:
-  bool JoinMulticast(void);
-  bool DropMulticast(void);
+  int streamPort;

 public:
  cIptvProtocolUdp();
  virtual ~cIptvProtocolUdp();
-  int Read(unsigned char* *BufferAddr);
-  virtual bool Set(const char* Location, const int Parameter, const int Index);
-  virtual bool Open(void);
-  virtual bool Close(void);
-  virtual cString GetInformation(void);
+  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_PROTOCOLUDP_H
--- a/sectionfilter.c
+++ b/sectionfilter.c
@@ -3,16 +3,12 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: sectionfilter.c,v 1.15 2007/10/20 23:25:14 ajhseppa Exp $
 */

 #include "sectionfilter.h"
-#include "statistics.h"

-#define IPTV_FILTER_FILENAME "/tmp/vdr-iptv%d.filter%d"
-
-cIptvSectionFilter::cIptvSectionFilter(int Index, int devInd,
-				       u_short Pid, u_char Tid, u_char Mask)
+cIptvSectionFilter::cIptvSectionFilter(int DeviceIndex, int Index,
+                                       uint16_t Pid, uint8_t Tid, uint8_t Mask)
 : pusi_seen(0),
  feedcc(0),
  doneq(0),
@@ -21,283 +17,202 @@ 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++) {
-    mode = filter_mode[i];
-    mask = filter_mask[i];
-    maskandmode[i] = mask & mode;
-    local_doneq |= maskandnotmode[i] = mask & ~mode;
-  }
+  for (i = 0; i < DMX_MAX_FILTER_SIZE; ++i) {
+      mode = filter_mode[i];
+      mask = filter_mask[i];
+      maskandmode[i] = (uint8_t)(mask & mode);
+      maskandnotmode[i] = (uint8_t)(mask & ~mode);
+      local_doneq |= maskandnotmode[i];
+      }
  doneq = local_doneq ? 1 : 0;

-  struct stat sb;
-  stat(pipeName, &sb);
-  if (S_ISFIFO(sb.st_mode))
-     unlink(pipeName);
-  int err = mknod(pipeName, 0644 | S_IFIFO, 0);
-  ERROR_IF_RET(err < 0, "mknod()", return);
-
-  // Create descriptors
-  fifoDescriptor = open(pipeName, O_RDWR | O_NONBLOCK);
-  readDescriptor = open(pipeName, O_RDONLY | O_NONBLOCK);
+  // Create sockets
+  socket[0] = socket[1] = -1;
+  if (socketpair(AF_UNIX, SOCK_DGRAM, 0, socket) != 0) {
+     char tmp[64];
+     error("Opening section filter sockets failed (device=%d id=%d): %s\n", devid, id, strerror_r(errno, tmp, sizeof(tmp)));
+     }
+  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)));
+     }
 }

 cIptvSectionFilter::~cIptvSectionFilter()
 {
-  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d)\n", id);
-  close(fifoDescriptor);
-  close(readDescriptor);
-  unlink(pipeName);
-  memset(pipeName, '\0', sizeof(pipeName));
-  fifoDescriptor = -1;
-  readDescriptor = -1;
+  //debug("cIptvSectionFilter::~cIptvSectionfilter(%d, %d)\n", devid, id);
+  int tmp = socket[1];
+  socket[1] = -1;
+  if (tmp >= 0)
+     close(tmp);
+  tmp = socket[0];
+  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)
-{
-  // See if there is data in the fifo
-  int retval = select_single_desc(fifoDescriptor, 0, false);
-  // There is no data in the fifo, more can be written
-  if (!retval) {
-#ifdef DEBUG_PRINTF
-     printf("id = %d, pid %d would now write %d data to buffer\n", id, pid, buffer1_len);
-     for (unsigned int i = 0; i < buffer1_len; ++i)
-         printf("0x%X ", buffer1[i]);
-     printf("\n");
-#endif
-     retval = write(fifoDescriptor, buffer1, buffer1_len);
-     ERROR_IF(retval < 0, "write()");
-     // Update statistics
-     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;
+  if (secbuf) {
+     int i;
+     uint8_t neq = 0;

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

-  if (doneq && !neq) {
-#ifdef DEBUG_PRINTF
-     printf("doneq discard, doneq = 0x%X, neq = 0x%X\n", doneq, !neq);
-#endif
-     return 0;
+     if (doneq && !neq)
+        return 0;
+
+     // There is no data in the read socket, more can be written
+     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) {
-#ifdef DEMUX_SECTION_LOSS_LOG
-     printf("sectionfilter.c section buffer full loss: %d/%d\n",
-            tsfeedp + len - DMX_MAX_SECFEED_SIZE,
-            DMX_MAX_SECFEED_SIZE);
-#endif
-     len = DMX_MAX_SECFEED_SIZE - tsfeedp;
-     }
+  if (tsfeedp + len > DMX_MAX_SECFEED_SIZE)
+     len = (uint8_t)(DMX_MAX_SECFEED_SIZE - tsfeedp);

  if (len <= 0)
     return 0;

  memcpy(secbuf_base + tsfeedp, buf, len);
-  tsfeedp += len;
+  tsfeedp = uint16_t(tsfeedp + len);

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

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

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

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

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

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

-  uint8_t p = 188 - count;	/* payload start */
+  // Payload start
+  uint8_t p = (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) {
-     /* adaption field present, check for discontinuity_indicator */
-     if ((buf[4] > 0) && (buf[5] & 0x80))
+  if (Data[3] & 0x20) {
+     // Adaption field present, check for discontinuity_indicator
+     if ((Data[4] > 0) && (Data[5] & 0x80))
        dc_i = 1;
     }

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

-  if (buf[1] & 0x40) {
-     /* PUSI=1 (is set), section boundary is here */
-     if (count > 1 && buf[p] < count) {
-#ifdef DEBUG_PRINTF
-        printf("Valid section\n");
-#endif
-        const uint8_t *before = &buf[p + 1];
-        uint8_t before_len = buf[p];
+  if (Data[1] & 0x40) {
+     // PUSI=1 (is set), section boundary is here
+     if (count > 1 && Data[p] < count) {
+        const uint8_t *before = &Data[p + 1];
+        uint8_t before_len = Data[p];
        const uint8_t *after = &before[before_len];
-        uint8_t after_len = count - 1 - before_len;
+        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();
-        demux_swfilter_section_copy_dump(after, after_len);
+        New();
+        CopyDump(after, after_len);
        }
-#ifdef DEMUX_SECTION_LOSS_LOG
-     else if (count > 0)
-        printf("sectionfilter.c PUSI=1 but %d bytes lost\n", count);
-#endif
     }
  else {
-     /* PUSI=0 (is not set), no section boundary */
-     demux_swfilter_section_copy_dump(&buf[p], count);
+     // PUSI=0 (is not set), no section boundary
+     CopyDump(&Data[p], count);
     }
 }
--- a/sectionfilter.h
+++ b/sectionfilter.h
@@ -3,49 +3,27 @@
 *
 * 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 <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>
+#ifdef __FreeBSD__
+#include <sys/socket.h>
+#endif // __FreeBSD__
+#include <vdr/device.h>

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

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

-  int fifoDescriptor;
-  int readDescriptor;
-
  int pusi_seen;
  int feedcc;
  int doneq;
@@ -56,49 +34,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 section_length(const uint8_t *buf);
-
-  int dmxdev_section_callback(const uint8_t *buffer1,
-                              size_t buffer1_len,
-                              const uint8_t *buffer2,
-                              size_t buffer2_len,
-                              enum dmx_success success);
-
-  void demux_swfilter_section_new();
-
-  int demux_swfilter_sectionfilter();
-
-  inline int demux_swfilter_section_feed();
-
-  int demux_swfilter_section_copy_dump(const uint8_t *buf,
-                                       uint8_t len);
-
-  int GetFifoDesc();
-  void ClearPipeName();
-  void SetPipeName(int deviceIndex);
+  inline uint16_t GetLength(const uint8_t *Data);
+  void New(void);
+  int Filter(void);
+  inline int Feed(void);
+  int CopyDump(const uint8_t *buf, uint8_t len);

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

 #endif // __IPTV_SECTIONFILTER_H
--- a/setup.c
+++ b/setup.c
@@ -3,505 +3,16 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: setup.c,v 1.43 2007/10/27 12:07:40 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,
-    eProtocolEXT,
-    eProtocolCount
-  };
-  struct tIptvChannel {
-    int frequency, source, protocol, parameter, 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 *Parameter, 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");
-  protocols[eProtocolEXT] = tr("EXT");
-  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 *Parameter, int *Protocol)
-{
-  char *tag = NULL;
-  char *proto = NULL;
-  char *loc = NULL;
-  if (sscanf(Param, "%a[^|]|%a[^|]|%a[^|]|%u", &tag, &proto, &loc, Parameter) == 4) {
-     cString tagstr(tag, true);
-     cString protostr(proto, true);
-     cString locstr(loc, true);
-     // check if IPTV tag
-     if (strncasecmp(*tagstr, "IPTV", 4) == 0) {
-        // check if protocol is supported and update the pointer
-        if (strncasecmp(*protostr, "UDP", 3) == 0)
-           *Protocol = eProtocolUDP;
-        else if (strncasecmp(*protostr, "HTTP", 4) == 0)
-           *Protocol = eProtocolHTTP;
-        else if (strncasecmp(*protostr, "FILE", 4) == 0)
-           *Protocol = eProtocolFILE;
-        else if (strncasecmp(*protostr, "EXT", 3) == 0)
-           *Protocol = eProtocolEXT;
-        else
-           return NULL;
-        // return location
-        return locstr;
-        }
-     }
-  return NULL;
-}
-
-void cIptvMenuEditChannel::GetChannelData(cChannel *Channel)
-{
-  if (Channel) {
-     int parameter, 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(), &parameter, &protocol), sizeof(data.location));
-     data.protocol = protocol;
-     data.parameter = parameter;
-     }
-  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.parameter = 1234;
-     }
-}
-
-void cIptvMenuEditChannel::SetChannelData(cChannel *Channel)
-{
-  if (Channel) {
-     cString param;
-     char alangs[MAXAPIDS][MAXLANGCODE2] = { "" };
-     char dlangs[MAXDPIDS][MAXLANGCODE2] = { "" };
-     switch (data.protocol) {
-       case eProtocolEXT:
-            param = cString::sprintf("IPTV|EXT|%s|%d", data.location, data.parameter);
-            break;
-       case eProtocolFILE:
-            param = cString::sprintf("IPTV|FILE|%s|%d", data.location, data.parameter);
-            break;
-       case eProtocolHTTP:
-            param = cString::sprintf("IPTV|HTTP|%s|%d", data.location, data.parameter);
-            break;
-       default:
-       case eProtocolUDP:
-            param = cString::sprintf("IPTV|UDP|%s|%d", data.location, data.parameter);
-            break;
-       }
-#if defined(APIVERSNUM) && APIVERSNUM < 10510
-     Channel->SetPids(data.vpid, data.ppid, data.apid, alangs, data.dpid, dlangs, data.tpid);
-#else
-     char slangs[MAXSPIDS][MAXLANGCODE2] = { "" };
-     Channel->SetPids(data.vpid, data.ppid, data.apid, alangs, data.dpid, dlangs, data.spid, slangs, data.tpid);
-#endif
-     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,
-                            eProtocolCount, 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.parameter,  0, 0xFFFF));
-         break;
-    case eProtocolEXT:
-         Add(new cMenuEditStrItem(tr("Script"),     data.location, sizeof(data.location), trVDR(FileNameChars)));
-         Add(new cMenuEditIntItem(tr("Parameter"), &data.parameter,  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.parameter,  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));
-#if defined(APIVERSNUM) && APIVERSNUM >= 10510
-  Add(new cMenuEditIntItem(trVDR("Spid1"),     &data.spid[0],  0, 0x1FFF));
-  Add(new cMenuEditIntItem(trVDR("Spid2"),     &data.spid[1],  0, 0x1FFF));
-#endif
-  Add(new cMenuEditIntItem(trVDR("Tpid"),      &data.tpid,     0, 0x1FFF));
-  Add(new cMenuEditIntItem(trVDR("CA"),        &data.caids[0], 0, 0xFFFF));
-  Add(new cMenuEditIntItem(trVDR("Sid"),       &data.sid,      1, 0xFFFF));
-  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 eProtocolEXT:
-            strn0cpy(data.location, "iptvstream.sh", sizeof(data.location));
-            data.parameter = 0;
-            break;
-       case eProtocolFILE:
-            strn0cpy(data.location, "/video/stream.ts", sizeof(data.location));
-            data.parameter = 0;
-            break;
-       case eProtocolHTTP:
-            strn0cpy(data.location, "127.0.0.1/TS/1", sizeof(data.location));
-            data.parameter = 3000;
-            break;
-       default:
-       case eProtocolUDP:
-            strn0cpy(data.location, "127.0.0.1", sizeof(data.location));
-            data.parameter = 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() && !strncasecmp(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
@@ -549,13 +60,13 @@ void cIptvMenuInfo::Display(void)
 {
  cOsdMenu::Display();
  DisplayMenu()->SetText(text, true);
-  if (text)
+  if (*text)
     cStatus::MsgOsdTextItem(text);
 }

 eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
 {
-  switch (Key) {
+  switch (int(Key)) {
    case kUp|k_Repeat:
    case kUp:
    case kDown|k_Repeat:
@@ -584,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())
@@ -605,7 +116,6 @@ cIptvPluginSetup::cIptvPluginSetup()
  tsBufferPrefill = IptvConfig.GetTsBufferPrefillRatio();
  extProtocolBasePort = IptvConfig.GetExtProtocolBasePort();
  sectionFiltering = IptvConfig.GetSectionFiltering();
-  sidScanning = IptvConfig.GetSidScanning();
  numDisabledFilters = IptvConfig.GetDisabledFiltersCount();
  if (numDisabledFilters > SECTION_FILTER_TABLE_SIZE)
     numDisabledFilters = SECTION_FILTER_TABLE_SIZE;
@@ -614,37 +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 cMenuEditIntItem( tr("EXT protocol base port"),      &extProtocolBasePort, 0, 0xFFF7));
-  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");
@@ -658,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;
 }

@@ -699,14 +219,12 @@ void cIptvPluginSetup::Store(void)
  SetupStore("TsBufferPrefill", tsBufferPrefill);
  SetupStore("ExtProtocolBasePort", extProtocolBasePort);
  SetupStore("SectionFiltering", sectionFiltering);
-  SetupStore("SidScanning", sidScanning);
  StoreFilters("DisabledFilters", disabledFilterIndexes);
  // Update global config
  IptvConfig.SetTsBufferSize(tsBufferSize);
  IptvConfig.SetTsBufferPrefillRatio(tsBufferPrefill);
  IptvConfig.SetExtProtocolBasePort(extProtocolBasePort);
  IptvConfig.SetSectionFiltering(sectionFiltering);
-  IptvConfig.SetSidScanning(sidScanning);
  for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i)
      IptvConfig.SetDisabledFilters(i, disabledFilterIndexes[i]);
 }
--- a/setup.h
+++ b/setup.h
@@ -3,15 +3,61 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: setup.h,v 1.16 2007/10/20 17:26:46 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:
@@ -19,14 +65,13 @@ private:
  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:
--- a/sidscanner.c
+++ b/sidscanner.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: sidscanner.c,v 1.1 2007/10/01 18:14:57 rahrenbe Exp $
 */

 #include <libsi/section.h>
@@ -12,10 +11,19 @@
 #include "sidscanner.h"

 cSidScanner::cSidScanner(void)
+: channelId(tChannelID::InvalidID),
+  sidFound(false),
+  nidFound(false),
+  tidFound(false)
 {
  debug("cSidScanner::cSidScanner()\n");
-  channel = cChannel();
  Set(0x00, 0x00);  // PAT
+  Set(0x10, 0x40);  // NIT
+}
+
+cSidScanner::~cSidScanner()
+{
+  debug("cSidScanner::~cSidScanner()\n");
 }

 void cSidScanner::SetStatus(bool On)
@@ -24,42 +32,70 @@ void cSidScanner::SetStatus(bool On)
  cFilter::SetStatus(On);
 }

-void cSidScanner::SetChannel(const cChannel *Channel)
+void cSidScanner::SetChannel(const tChannelID &ChannelId)
 {
-  if (Channel) {
-     debug("cSidScanner::SetChannel(): %s\n", Channel->PluginParam());
-     channel = *Channel;
-     }
-  else {
-     debug("cSidScanner::SetChannel()\n");
-     channel = cChannel();
-     }
+  debug("cSidScanner::SetChannel(): %s\n", *ChannelId.ToString());
+  channelId = ChannelId;
+  sidFound = false;
+  nidFound = false;
+  tidFound = false;
 }

 void cSidScanner::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
 {
+  int newSid = -1, newNid = -1, newTid = -1;
+
  //debug("cSidScanner::Process()\n");
-  if ((Pid == 0x00) && (Tid == 0x00) && channel.GetChannelID().Valid()) {
-     debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
-     SI::PAT pat(Data, false);
-     if (!pat.CheckCRCAndParse())
-        return;
-     SI::PAT::Association assoc;
-     for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); ) {
-         if (!assoc.isNITPid()) {
-            if (assoc.getServiceId() != channel.Sid()) {
-               debug("cSidScanner::Process(): Sid=%d\n", assoc.getServiceId());
-               if (!Channels.Lock(true, 10))
-                  return;
-               cChannel *IptvChannel = Channels.GetByChannelID(channel.GetChannelID());
-               IptvChannel->SetId(IptvChannel->Nid(), IptvChannel->Tid(),
-                                  assoc.getServiceId(), IptvChannel->Rid());
-               Channels.Unlock();
+  if (channelId.Valid()) {
+     if ((Pid == 0x00) && (Tid == 0x00)) {
+        debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
+        SI::PAT pat(Data, false);
+        if (!pat.CheckCRCAndParse())
+           return;
+        SI::PAT::Association assoc;
+        for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); ) {
+            if (!assoc.isNITPid()) {
+               if (assoc.getServiceId() != channelId.Sid()) {
+                  debug("cSidScanner::Process(): Sid=%d\n", assoc.getServiceId());
+                  newSid = assoc.getServiceId();
+                  }
+               sidFound = true;
+               break;
               }
-            SetChannel(NULL);
-            SetStatus(false);
-            return;
            }
-         }
+        }
+     else if ((Pid == 0x10) && (Tid == 0x40)) {
+        debug("cSidScanner::Process(): Pid=%d Tid=%02X\n", Pid, Tid);
+        SI::NIT nit(Data, false);
+        if (!nit.CheckCRCAndParse())
+           return;
+        SI::NIT::TransportStream ts;
+        for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) {
+            if (ts.getTransportStreamId() != channelId.Tid()) {
+               debug("cSidScanner::Process(): TSid=%d\n", ts.getTransportStreamId());
+               newTid = ts.getTransportStreamId();
+               }
+            tidFound = true;
+            break; // default to the first one
+            }
+        if (nit.getNetworkId() != channelId.Nid()) {
+           debug("cSidScanner::Process(): Nid=%d\n", ts.getTransportStreamId());
+           newNid = nit.getNetworkId();
+           }
+        nidFound = true; 
+        }
+     }
+  if ((newSid >= 0) || (newNid >= 0) || (newTid >= 0)) {
+     if (!Channels.Lock(true, 10))
+        return;
+     cChannel *IptvChannel = Channels.GetByChannelID(channelId);
+     if (IptvChannel)
+        IptvChannel->SetId((newNid < 0) ? IptvChannel->Nid() : newNid, (newTid < 0) ? IptvChannel->Tid() : newTid,
+                           (newSid < 0) ? IptvChannel->Sid() : newSid, IptvChannel->Rid());
+     Channels.Unlock();
+     }
+  if (sidFound && nidFound && tidFound) {
+     SetChannel(tChannelID::InvalidID);
+     SetStatus(false);
     }
 }
--- a/sidscanner.h
+++ b/sidscanner.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: sidscanner.h,v 1.1 2007/10/01 18:14:57 rahrenbe Exp $
 */

 #ifndef __SIDSCANNER_H
@@ -14,15 +13,21 @@

 class cSidScanner : public cFilter {
 private:
-  cChannel channel;
+  tChannelID channelId;
+  bool sidFound;
+  bool nidFound;
+  bool tidFound;

 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);
+  ~cSidScanner();
+  void SetChannel(const tChannelID &ChannelId);
+  void Open() { SetStatus(true); }
+  void Close() { SetStatus(false); }
 };

 #endif // __SIDSCANNER_H
--- a/socket.c
+++ b/socket.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: socket.c,v 1.6 2007/10/26 22:07:10 rahrenbe Exp $
 */

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

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

 bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
@@ -51,7 +44,7 @@ bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
     }
  // Bind to the socket if it is not active already
  if (socketDesc < 0) {
-     int yes = 1;     
+     int yes = 1;
     // Create socket
     if (isUdp)
        socketDesc = socket(PF_INET, SOCK_DGRAM, 0);
@@ -59,19 +52,25 @@ bool cIptvSocket::OpenSocket(const int Port, const bool isUdp)
        socketDesc = socket(PF_INET, SOCK_STREAM, 0);
     ERROR_IF_RET(socketDesc < 0, "socket()", return false);
     // Make it use non-blocking I/O to avoid stuck read calls
-     ERROR_IF_FUNC(fcntl(socketDesc, F_SETFL, O_NONBLOCK), "fcntl()", CloseSocket(), return false);
+     ERROR_IF_FUNC(fcntl(socketDesc, F_SETFL, O_NONBLOCK), "fcntl(O_NONBLOCK)",
+                   CloseSocket(), return false);
     // Allow multiple sockets to use the same PORT number
-     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes,
-                              sizeof(yes)) < 0, "setsockopt()", CloseSocket(), return false);
+     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0, "setsockopt(SO_REUSEADDR)",
+                   CloseSocket(), return false);
+#ifndef __FreeBSD__
+     // Allow packet information to be fetched
+     ERROR_IF_FUNC(setsockopt(socketDesc, SOL_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0, "setsockopt(IP_PKTINFO)",
+                   CloseSocket(), return false);
+#endif // __FreeBSD__
     // Bind socket
     memset(&sockAddr, '\0', sizeof(sockAddr));
     sockAddr.sin_family = AF_INET;
-     sockAddr.sin_port = htons(Port);
+     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;
     }
@@ -85,11 +84,14 @@ void cIptvSocket::CloseSocket(void)
  if (socketDesc >= 0) {
     close(socketDesc);
     socketDesc = -1;
+     socketPort = 0;
+     memset(&sockAddr, 0, sizeof(sockAddr));
     }
 }

 // UDP socket class
 cIptvUdpSocket::cIptvUdpSocket()
+: streamAddr(INADDR_ANY)
 {
  debug("cIptvUdpSocket::cIptvUdpSocket()\n");
 }
@@ -99,68 +101,133 @@ cIptvUdpSocket::~cIptvUdpSocket()
  debug("cIptvUdpSocket::~cIptvUdpSocket()\n");
 }

-bool cIptvUdpSocket::OpenSocket(const int Port)
+bool cIptvUdpSocket::OpenSocket(const int Port, const in_addr_t StreamAddr)
 {
  debug("cIptvUdpSocket::OpenSocket()\n");
+  streamAddr = StreamAddr;
  return cIptvSocket::OpenSocket(Port, true);
 }

-int cIptvUdpSocket::Read(unsigned char* *BufferAddr)
+void cIptvUdpSocket::CloseSocket(void)
+{
+  debug("cIptvUdpSocket::CloseSocket()\n");
+  streamAddr = INADDR_ANY;
+  cIptvSocket::CloseSocket();
+}
+
+bool cIptvUdpSocket::JoinMulticast(void)
+{
+  debug("cIptvUdpSocket::JoinMulticast()\n");
+  // Check if socket exists
+  if (!isActive && (socketDesc >= 0)) {
+     // Join a new multicast group
+     struct ip_mreq mreq;
+     mreq.imr_multiaddr.s_addr = streamAddr;
+     mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+     ERROR_IF_RET(setsockopt(socketDesc, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_ADD_MEMBERSHIP)", return false);
+     // Update multicasting flag
+     isActive = true;
+     }
+  return true;
+}
+
+bool cIptvUdpSocket::DropMulticast(void)
+{
+  debug("cIptvUdpSocket::DropMulticast()\n");
+  // Check if socket exists
+  if (isActive && (socketDesc >= 0)) {
+     // Drop the existing multicast group
+     struct ip_mreq mreq;
+     mreq.imr_multiaddr.s_addr = streamAddr;
+     mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+     ERROR_IF_RET(setsockopt(socketDesc, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0, "setsockopt(IP_DROP_MEMBERSHIP)", return false);
+     // Update multicasting flag
+     isActive = false;
+     }
+  return true;
+}
+
+
+int cIptvUdpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
  //debug("cIptvUdpSocket::Read()\n");
  // Error out if socket not initialized
  if (socketDesc <= 0) {
-    error("ERROR: Invalid socket in %s\n", __FUNCTION__);
-    return -1;
-  }
-  socklen_t addrlen = sizeof(sockAddr);
-  // Set argument point to read buffer
-  *BufferAddr = readBuffer;
-  // Wait 500ms for data
-  int retval = select_single_desc(socketDesc, 500000, false);
-  // Check if error
-  if (retval < 0)
-     return retval;
-  // Check if data available
-  else if (retval) {
-     int len = 0;
-     // Read data from socket
-     if (isActive)
-        len = recvfrom(socketDesc, readBuffer, readBufferLen, MSG_DONTWAIT,
-                       (struct sockaddr *)&sockAddr, &addrlen);
-     ERROR_IF_RET(len < 0, "recvfrom()", return len);
-     if ((len > 0) && (readBuffer[0] == 0x47)) {
-        // Set argument point to read buffer
-        *BufferAddr = &readBuffer[0];
-        return len;
-        }
-     else if (len > 3) {
-        // http://www.networksorcery.com/enp/rfc/rfc2250.txt
-        // version
-        unsigned int v = (readBuffer[0] >> 6) & 0x03;
-        // extension bit
-        unsigned int x = (readBuffer[0] >> 4) & 0x01;
-        // cscr count
-        unsigned int cc = readBuffer[0] & 0x0F;
-        // payload type: MPEG2 TS = 33
-        //unsigned int pt = readBuffer[1] & 0x7F;
-        // header lenght
-        unsigned int headerlen = (3 + cc) * sizeof(uint32_t);
-        // check if extension
-        if (x) {
-           // extension header length
-           unsigned int ehl = (((readBuffer[headerlen + 2] & 0xFF) << 8) | (readBuffer[headerlen + 3] & 0xFF));
-           // update header length
-           headerlen += (ehl + 1) * sizeof(uint32_t);
-           }
-        // Check that rtp is version 2 and payload contains multiple of TS packet data
-        if ((v == 2) && (((len - headerlen) % TS_SIZE) == 0) && (readBuffer[headerlen] == 0x47)) {
-           // Set argument point to payload in read buffer
-           *BufferAddr = &readBuffer[headerlen];
-           return (len - headerlen);
-           }
-        }
+     error("Invalid socket in %s\n", __FUNCTION__);
+     return -1;
     }
+  int len = 0;
+  // Read data from socket in a loop
+  do {
+    socklen_t addrlen = sizeof(sockAddr);
+    struct msghdr msgh;
+    struct cmsghdr *cmsg;
+    struct iovec iov;
+    char cbuf[256];
+    len = 0;
+    // Initialize iov and msgh structures
+    memset(&msgh, 0, sizeof(struct msghdr));
+    iov.iov_base = BufferAddr;
+    iov.iov_len = BufferLen;
+    msgh.msg_control = cbuf;
+    msgh.msg_controllen = sizeof(cbuf);
+    msgh.msg_name = &sockAddr;
+    msgh.msg_namelen = addrlen;
+    msgh.msg_iov  = &iov;
+    msgh.msg_iovlen = 1;
+    msgh.msg_flags = 0;
+
+    if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
+       len = (int)recvmsg(socketDesc, &msgh, MSG_DONTWAIT);
+    else
+       break;
+    if (len > 0) {
+#ifndef __FreeBSD__
+       // Process auxiliary received data and validate source address
+       for (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(&msgh, cmsg)) {
+           if ((cmsg->cmsg_level == SOL_IP) && (cmsg->cmsg_type == IP_PKTINFO)) {
+              struct in_pktinfo *i = (struct in_pktinfo *)CMSG_DATA(cmsg);
+              if ((i->ipi_addr.s_addr == streamAddr) || (INADDR_ANY == streamAddr)) {
+#endif // __FreeBSD__
+                 if (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);
+                       }
+                    }
+#ifndef __FreeBSD__
+                 }
+              }
+           }
+#endif // __FreeBSD__
+       }
+    } while (len > 0);
+  ERROR_IF_RET(len < 0 && errno != EAGAIN, "recvmsg()", return -1);
+
  return 0;
 }

@@ -175,34 +242,117 @@ cIptvTcpSocket::~cIptvTcpSocket()
  debug("cIptvTcpSocket::~cIptvTcpSocket()\n");
 }

-bool cIptvTcpSocket::OpenSocket(const int Port)
+bool cIptvTcpSocket::OpenSocket(const int Port, const char *StreamAddr)
 {
  debug("cIptvTcpSocket::OpenSocket()\n");
-  return cIptvSocket::OpenSocket(Port, false);
+
+  // Socket must be opened before setting the host address
+  bool retval = cIptvSocket::OpenSocket(Port, false);
+
+  // 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);
+
+     // It may be a host name, get the name
+     struct hostent *host;
+     host = gethostbyname(StreamAddr);
+     if (!host) {
+        char tmp[64];
+        error("gethostbyname() failed: %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);
+     }
+
+  return retval;
 }

-int cIptvTcpSocket::Read(unsigned char* *BufferAddr)
+void cIptvTcpSocket::CloseSocket(void)
+{
+  debug("cIptvTcpSocket::CloseSocket()\n");
+  cIptvSocket::CloseSocket();
+}
+
+bool cIptvTcpSocket::ConnectSocket(void)
+{
+  debug("cIptvTcpSocket::ConnectSocket()\n");
+  if (!isActive && (socketDesc >= 0)) {
+     int retval = connect(socketDesc, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
+     // Non-blocking sockets always report in-progress error when connected
+     ERROR_IF_RET(retval < 0 && errno != EINPROGRESS, "connect()", return false);
+     // Select with 800ms timeout on the socket completion, check if it is writable
+     retval = select_single_desc(socketDesc, 800000, true);
+     if (retval < 0)
+        return retval;
+     // Select has returned. Get socket errors if there are any
+     retval = 0;
+     socklen_t len = sizeof(retval);
+     getsockopt(socketDesc, SOL_SOCKET, SO_ERROR, &retval, &len);
+     // If not any errors, then socket must be ready and connected
+     if (retval != 0) {
+        char tmp[64];
+        error("Connect() failed: %s", strerror_r(retval, tmp, sizeof(tmp)));
+        return false;
+        }
+     }
+
+  return true;
+}
+
+int cIptvTcpSocket::Read(unsigned char* BufferAddr, unsigned int BufferLen)
 {
  //debug("cIptvTcpSocket::Read()\n");
  // Error out if socket not initialized
  if (socketDesc <= 0) {
-    error("ERROR: Invalid socket in %s\n", __FUNCTION__);
-    return -1;
-  }
+     error("Invalid socket in %s\n", __FUNCTION__);
+     return -1;
+     }
+  int len = 0;
+  socklen_t addrlen = sizeof(sockAddr);
+  // Read data from socket
+  if (isActive && socketDesc && BufferAddr && (BufferLen > 0))
+     len = (int)recvfrom(socketDesc, BufferAddr, BufferLen, MSG_DONTWAIT,
+                         (struct sockaddr *)&sockAddr, &addrlen);
+  return len;
+}
+
+bool cIptvTcpSocket::ReadChar(char* BufferAddr, unsigned int TimeoutMs)
+{
+  //debug("cIptvTcpSocket::ReadChar()\n");
+  // Error out if socket not initialized
+  if (socketDesc <= 0) {
+     error("Invalid socket in %s\n", __FUNCTION__);
+     return false;
+     }
  socklen_t addrlen = sizeof(sockAddr);
-  // Set argument point to read buffer
-  *BufferAddr = readBuffer;
  // Wait 500ms for data
-  int retval = select_single_desc(socketDesc, 500000, false);
+  int retval = select_single_desc(socketDesc, 1000 * TimeoutMs, false);
  // Check if error
  if (retval < 0)
-     return retval;
+     return false;
  // Check if data available
  else if (retval) {
-     // Read data from socket
-     if (isActive)
-        return recvfrom(socketDesc, readBuffer, readBufferLen, MSG_DONTWAIT,
-                        (struct sockaddr *)&sockAddr, &addrlen);
+     retval = (int)recvfrom(socketDesc, BufferAddr, 1, MSG_DONTWAIT,
+                            (struct sockaddr *)&sockAddr, &addrlen);
+     if (retval <= 0)
+        return false;
     }
-  return 0;
+
+  return true;
+}
+
+bool cIptvTcpSocket::Write(const char* BufferAddr, unsigned int BufferLen)
+{
+  //debug("cIptvTcpSocket::Write()\n");
+  // Error out if socket not initialized
+  if (socketDesc <= 0) {
+     error("Invalid socket in %s\n", __FUNCTION__);
+     return false;
+     }
+  ERROR_IF_RET(send(socketDesc, BufferAddr, BufferLen, 0) < 0, "send()", return false);
+
+  return true;
 }
--- a/socket.h
+++ b/socket.h
@@ -3,20 +3,22 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: socket.h,v 1.3 2007/10/21 19:32:15 ajhseppa Exp $
 */

 #ifndef __IPTV_SOCKET_H
 #define __IPTV_SOCKET_H

 #include <arpa/inet.h>
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif // __FreeBSD__

 class cIptvSocket {
-protected:
+private:
  int socketPort;
+
+protected:
  int socketDesc;
-  unsigned char* readBuffer;
-  unsigned int readBufferLen;
  struct sockaddr_in sockAddr;
  bool isActive;

@@ -30,19 +32,29 @@ public:
 };

 class cIptvUdpSocket : public cIptvSocket {
+private:
+  in_addr_t streamAddr;
+
 public:
  cIptvUdpSocket();
  virtual ~cIptvUdpSocket();
-  virtual int Read(unsigned char* *BufferAddr);
-  bool OpenSocket(const int Port);
+  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
+  bool OpenSocket(const int Port, const in_addr_t StreamAddr = INADDR_ANY);
+  void CloseSocket(void);
+  bool JoinMulticast(void);
+  bool DropMulticast(void);
 };

 class cIptvTcpSocket : public cIptvSocket {
 public:
  cIptvTcpSocket();
  virtual ~cIptvTcpSocket();
-  virtual int Read(unsigned char* *BufferAddr);
-  bool OpenSocket(const int Port);
+  virtual int Read(unsigned char* BufferAddr, unsigned int BufferLen);
+  bool OpenSocket(const int Port, const char *StreamAddr);
+  void CloseSocket(void);
+  bool ConnectSocket(void);
+  bool ReadChar(char* BufferAddr, unsigned int TimeoutMs);
+  bool Write(const char* BufferAddr, unsigned int BufferLen);
 };

 #endif // __IPTV_SOCKET_H
--- a/source.c
+++ b/source.c
@@ -0,0 +1,176 @@
+/*
+ * 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),
+    data(),
+    itp()
+{
+  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 section ids"), &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;
+}
--- a/source.h
+++ b/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
--- a/statisticif.h
+++ b/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
--- a/statistics.c
+++ b/statistics.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: statistics.c,v 1.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,21 +139,21 @@ 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");
+  cString info = cString::sprintf("%ld k%s/s", bitrate, IptvConfig.GetUseBytes() ? "B" : "bit");
  dataBytes = 0;
  return info;
 }

-void cIptvStreamerStatistics::AddStatistic(long Bytes)
+void cIptvStreamerStatistics::AddStreamerStatistic(long Bytes)
 {
  //debug("cIptvStreamerStatistics::AddStatistic(Bytes=%ld)\n", Bytes);
  cMutexLock MutexLock(&mutex);
@@ -165,6 +164,7 @@ void cIptvStreamerStatistics::AddStatistic(long Bytes)
 // Buffer statistic class
 cIptvBufferStatistics::cIptvBufferStatistics()
 : dataBytes(0),
+  freeSpace(0),
  usedSpace(0),
  timer(),
  mutex()
@@ -177,13 +177,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 +201,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);
--- a/statistics.h
+++ b/statistics.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: statistics.h,v 1.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;
--- a/streamer.c
+++ b/streamer.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: streamer.c,v 1.27 2007/10/20 08:58:15 ajhseppa Exp $
 */

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

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

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

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

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

@@ -88,16 +89,17 @@ bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Ind
 {
  debug("cIptvStreamer::Set(): %s:%d\n", Location, Parameter);
  if (!isempty(Location)) {
-     // Update protocol; Close the existing one if changed
+     // Update protocol and set location and parameter; Close the existing one if changed
     if (protocol != Protocol) {
        if (protocol)
           protocol->Close();
        protocol = Protocol;
-        if (protocol)
+        if (protocol) {
+           protocol->Set(Location, Parameter, Index);
           protocol->Open();
+           }
        }
-     // Set protocol location and parameter
-     if (protocol)
+     else if (protocol)
        protocol->Set(Location, Parameter, Index);
     }
  return true;
@@ -106,8 +108,8 @@ bool cIptvStreamer::Set(const char* Location, const int Parameter, const int Ind
 cString cIptvStreamer::GetInformation(void)
 {
  //debug("cIptvStreamer::GetInformation()");
-  cString info("Stream:");
+  cString info;
  if (protocol)
-     info = cString::sprintf("%s %s", *info, *protocol->GetInformation());
-  return cString::sprintf("%s\n", *info);
+     info = protocol->GetInformation();
+  return info;
 }
--- a/streamer.h
+++ b/streamer.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: streamer.h,v 1.13 2007/10/19 22:18:55 rahrenbe Exp $
 */

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

-public:
-  cIptvStreamer(cRingBufferLinear* RingBuffer, cMutex* Mutex);
-  virtual ~cIptvStreamer();
+protected:
  virtual void Action(void);
+
+public:
+  cIptvStreamer(cRingBufferLinear* RingBuffer, unsigned int PacketLen);
+  virtual ~cIptvStreamer();
  bool Set(const char* Location, const int Parameter, const int Index, cIptvProtocolIf* Protocol);
  bool Open(void);
  bool Close(void);
@@ -36,4 +37,3 @@ public:
 };

 #endif // __IPTV_STREAMER_H
-
Author	SHA1	Message	Date
Rolf Ahrenberg	75d17b289b	Added FreeBSD support (Thanks to Jürgen Lock).	2012-07-10 22:12:29 +03:00
Rolf Ahrenberg	547306b67c	Updated translations.	2012-06-03 12:31:33 +03:00
Rolf Ahrenberg	763c83209d	Updated README.	2012-06-03 12:24:09 +03:00
Rolf Ahrenberg	af85ef1703	Prepared for 1.0.0 release.	2012-06-02 21:57:29 +03:00
Rolf Ahrenberg	24ecadf414	Updated device selection.	2012-06-02 15:37:05 +03:00
Antti Seppälä	f4126b7e2c	Try to read all data from udp socket at once Existing implementation of udp read mechanism was giving up too easily. Replaced it with version that tries more actively to drain the entire socket buffer. Signed-off-by: Antti Seppälä <a.seppala@gmail.com>	2012-06-02 14:34:41 +03:00
Rolf Ahrenberg	c7cbde301b	Tweaked reading from UDP sockets.	2012-06-02 13:32:28 +03:00
Rolf Ahrenberg	06506c41f6	Fixed TCP socket connection and silenced compilation warnings.	2012-04-26 21:32:20 +03:00
Rolf Ahrenberg	c33b05076a	Incremented version number and updated HISTORY.	2012-04-26 00:29:46 +03:00
Rolf Ahrenberg	38bd9a21f6	Fixed response header parsing in HTTP protocol.	2012-04-26 00:27:24 +03:00
Rolf Ahrenberg	4c7b2ea69b	Added cIptvDevice::DeviceType() and updated HISTORY.	2012-04-02 19:15:53 +03:00
Rolf Ahrenberg	c475b26515	Changed UDP protocol to always utilize the source address validation.	2012-04-02 00:35:32 +03:00
Rolf Ahrenberg	9145fb8bb8	Silenced a warning in the HTTP protocol.	2012-04-01 22:47:50 +03:00
Rolf Ahrenberg	7a8b2962b2	Added support for a service interface.	2012-04-01 22:46:08 +03:00
Rolf Ahrenberg	626d0402c2	Updated the disable ca updates patch.	2012-03-31 20:43:10 +03:00
Rolf Ahrenberg	b3b06e569f	Fixed some channel switching bugs.	2012-03-31 20:32:04 +03:00
Rolf Ahrenberg	ff84c54d50	Fixed channel switching in UDP protocol.	2012-03-30 19:01:46 +03:00
Rolf Ahrenberg	4c39d8cf72	Updated device name.	2012-03-30 18:22:10 +03:00
Rolf Ahrenberg	0b790260fa	Updated for vdr-1.7.27.	2012-03-25 16:42:06 +03:00
Rolf Ahrenberg	79113bbe09	Updated default CXXFLAGS.	2012-03-25 16:03:22 +03:00
Rolf Ahrenberg	30de763a4b	Updated for vdr-1.7.26.	2012-03-10 23:22:20 +02:00
Rolf Ahrenberg	868865c47d	Updated for vdr-1.7.25.	2012-03-03 15:18:59 +02:00
Rolf Ahrenberg	a73921041f	Added a GIT tag into the version string.	2012-02-26 22:54:45 +02:00
Rolf Ahrenberg	49e3a9e23a	Silenced compilation warnings.	2012-02-19 19:14:10 +02:00
Rolf Ahrenberg	73311873bc	Updated Makefile.	2012-02-19 17:47:43 +02:00
Rolf Ahrenberg	816c357065	Updated the patch.	2012-02-19 17:43:43 +02:00
Rolf Ahrenberg	5838bda3f0	Added missing initializers.	2012-02-02 19:09:08 +02:00
Rolf Ahrenberg	079b02d69e	Updated translation files.	2012-02-02 18:56:05 +02:00
Rolf Ahrenberg	6582f137b9	Updated for vdr-1.7.23 and version number.	2012-02-02 18:50:18 +02:00
Rolf Ahrenberg	2bd31e9eda	Silenced harmless "case value not in enumerated type" warnings.	2011-12-04 19:40:46 +02:00
Rolf Ahrenberg	c2f88fbbb3	Updated for vdr-1.7.21.	2011-09-04 17:58:18 +03:00
Rolf Ahrenberg	52ae2bdf63	Updated patches.	2011-08-20 20:28:12 +03:00
Rolf Ahrenberg	1898defeb6	Updated for vdr-1.7.19.	2011-06-19 22:07:01 +03:00
Rolf Ahrenberg	21719d3397	Updated I18N target and patches.	2011-06-19 16:57:40 +03:00
Rolf Ahrenberg	bf3fc70d2d	Added cppcheck target into Makefile.	2011-06-15 17:49:15 +03:00
Rolf Ahrenberg	99d6c0f207	Updated patches.	2011-03-13 23:45:51 +02:00
Rolf Ahrenberg	ca4fdc761f	Added package name and version to xgettext and made 'dist' target dependent on up to date *.po files.	2011-03-13 18:58:22 +02:00
Rolf Ahrenberg	37c5ee26ae	Added support for LDFLAGS.	2010-12-14 19:27:00 +02:00
Rolf Ahrenberg	8ba0b3a417	Enabled one debug message.	2010-12-08 18:33:24 +02:00
Rolf Ahrenberg	cfb60a06ba	Tweaked translation files.	2010-12-08 10:47:44 +02:00
Rolf Ahrenberg	6ed0ebd734	Updated translation files.	2010-12-04 18:58:52 +02:00
Rolf Ahrenberg	2081ab41a8	Canonicalized the configuration directory.	2010-12-03 16:00:40 +02:00
Rolf Ahrenberg	66ab92584b	Fixed a regression introduced in HTTP protocol.	2010-12-02 17:32:02 +02:00
Rolf Ahrenberg	05e57802c3	Fixed debug compilation.	2010-12-01 10:09:11 +02:00
Rolf Ahrenberg	55bb0e65df	Disable detaching of receivers if retuned to an existing channel (Thanks to Zdeněk Kopřivík).	2010-11-29 21:09:17 +02:00
Rolf Ahrenberg	ea4f8fde31	Fixed Open()/Close() when using UDP protocol.	2010-11-29 18:27:39 +02:00
Rolf Ahrenberg	ef615c4bc5	Reverted script changes.	2010-11-29 12:26:01 +02:00
Rolf Ahrenberg	a6d4e850fc	Fixed EXT protocol execution (Thanks to Peter Holik). Changed scripts to use bash instead of sh.	2010-10-25 14:43:38 +03:00
Rolf Ahrenberg	fd06641449	Added Makefile depencency for objects. Changed ProvidesChannel() to set needsDetachReceivers only if any receivers are attached.	2010-10-11 23:19:59 +03:00
Rolf Ahrenberg	05e52079f8	Fixed the messed up version number.	2010-09-19 22:01:24 +03:00
Rolf Ahrenberg	f0469e24cc	Updated for vdr-1.7.16.	2010-09-19 20:48:07 +03:00
Rolf Ahrenberg	7629e34d2a	Refactored cIptvTcpSocket class.	2010-09-15 23:41:25 +03:00
Rolf Ahrenberg	ac458b0c36	Moved JoinMulticast()/DropMulticast() into cIptvUdpSocket class.	2010-09-15 18:18:46 +03:00
Rolf Ahrenberg	2d583e8cfa	Refactored multicast source address validation.	2010-09-15 17:37:20 +03:00
Rolf Ahrenberg	b0dba49fbc	Added missing setsockopt() for IP_PKTINFO. Cleaned up Italian translation.	2010-09-12 12:54:14 +03:00
Rolf Ahrenberg	a05766c90d	The "inetAddr" must be set after CloseSocket().	2010-09-10 23:41:26 +03:00
Rolf Ahrenberg	d1fdc390c9	Enabled partial content responses for HTTP protocol. Updated README and PO headers.	2010-09-10 10:54:06 +03:00
Rolf Ahrenberg	d126da8ed8	Changed ProvidesChannel() to set the need of detaching receivers due to VDR's channel selection mechanism.	2010-08-23 09:34:57 +03:00
Rolf Ahrenberg	2567501b65	Fixed audio pid detection in pid scanner.	2010-07-10 23:27:07 +03:00
Rolf Ahrenberg	12b54fbbc2	Refactored source address validation.	2010-07-02 23:08:02 +03:00
Rolf Ahrenberg	a2d8c367f6	Changed translation bug address and tweaked an example script.	2010-07-02 22:25:55 +03:00
Rolf Ahrenberg	3f88e7a911	Added validation for source addresses of socket data.	2010-07-02 18:28:49 +03:00
Rolf Ahrenberg	8a96e5b327	Renamed Sid scanner to section id scanner and added experimental Tid/Nid support into it.	2010-07-02 15:54:32 +03:00
Rolf Ahrenberg	170cb56263	Updated patches.	2010-06-06 20:47:28 +03:00
Rolf Ahrenberg	899db53845	Updated for vdr-1.7.15.	2010-06-06 20:36:58 +03:00
Rolf Ahrenberg	6eb259e8fb	Updated for vdr-1.7.14.	2010-03-14 17:39:52 +02:00
Rolf Ahrenberg	204c6020c4	Updated patches.	2010-03-09 16:35:05 +02:00
Rolf Ahrenberg	c207b5cf6e	Added Dutch translation (Thanks to Carel).	2010-03-09 11:18:18 +02:00
Rolf Ahrenberg	d8585ba0fc	Fixed channel parameter corruption.	2010-03-08 21:12:06 +02:00
Rolf Ahrenberg	1a825f5636	Fixed indentation.	2010-03-08 11:49:41 +02:00
Rolf Ahrenberg	0720489995	Tweaked the Makefile.	2010-03-06 22:02:45 +02:00
Rolf Ahrenberg	3b8cfd2323	Silenced compilation warnings.	2010-03-05 08:43:25 +02:00
Rolf Ahrenberg	d737278f78	Updated HISTORY and README.	2010-03-04 18:34:04 +02:00
Rolf Ahrenberg	906438e981	Added nid/tid/rid into the channel editor.	2010-03-04 18:22:28 +02:00
Rolf Ahrenberg	aa620a314c	Updated for vdr-1.7.13.	2010-03-04 17:34:21 +02:00
Rolf Ahrenberg	517547dc15	Updated patches.	2010-02-01 13:57:26 +02:00
Rolf Ahrenberg	60a4d266b7	Updated patches. Fixed argument corruption.	2010-01-06 19:02:40 +02:00
Rolf Ahrenberg	6901970b8a	Updated patches.	2010-01-06 17:14:49 +02:00
Rolf Ahrenberg	d67f0d6ead	Updated patches.	2009-11-22 18:23:08 +02:00
Rolf Ahrenberg	c0fc83cba6	Updated HISTORY.	2009-10-01 23:11:46 +03:00
Rolf Ahrenberg	49fcbc8921	Modified sectionfilters to use socket pair instead of filesystem fifos.	2009-10-01 18:48:28 +03:00
Rolf Ahrenberg	dbeb014a85	Updated patches.	2009-08-23 18:23:58 +03:00
Rolf Ahrenberg	26cd1aa1f1	Cleaned up compilation warnings.	2009-06-19 13:28:53 +03:00
Rolf Ahrenberg	a32cb95960	Fixed handling of HTTP protocol headers.	2009-06-17 16:07:58 +03:00
Rolf Ahrenberg	abfa46c064	Updated patches.	2009-06-17 15:15:38 +03:00
Rolf Ahrenberg	aa1bfab60d	Updated HISTORY.	2009-06-01 11:17:18 +03:00
Rolf Ahrenberg	3ffba13a6c	Updated patches for vdr-1.7.7.	2009-05-22 11:00:54 +03:00
Rolf Ahrenberg	57d63db034	Fixed setting parameters when protocol changes (Thanks to Peter Holik for reporting this one). Updated example scripts to use ffmpeg's direct UDP output and added a new "image.sh" script (Thanks to Peter Holik).	2009-05-22 10:50:20 +03:00
Rolf Ahrenberg	2484c3bdd6	Updated patches for vdr-1.7.5.	2009-04-14 12:58:09 +03:00
Rolf Ahrenberg	912bf068ac	Added iptvstream-notrap.sh script.	2009-03-31 08:17:24 +03:00
Rolf Ahrenberg	a8d01e32a1	Modified default compilation options.	2009-03-23 21:07:50 +02:00
Rolf Ahrenberg	d1c2d48a6b	Fixed remaining lint warnings.	2009-03-21 00:56:37 +02:00
Rolf Ahrenberg	e74d4f88f4	Fixed again lint warnings.	2009-03-20 23:38:26 +02:00
Rolf Ahrenberg	55bf971e3e	Fixed more lint warnings.	2009-03-20 18:00:17 +02:00
Rolf Ahrenberg	30abbc3e80	Fixed some lint warnings.	2009-03-20 17:43:31 +02:00
Rolf Ahrenberg	74761da04a	Fixed a locking bug with section filters.	2009-03-17 17:37:05 +02:00
Rolf Ahrenberg	b221a9a406	Added a note about recommended frequencies into README.	2009-03-17 08:30:57 +02:00
Rolf Ahrenberg	fd7a43d733	Added optional patches to disable CA updates.	2009-03-07 15:27:04 +02:00
Rolf Ahrenberg	d546cac834	Fixed pid scanner to set the existing video stream type.	2009-03-06 22:20:34 +02:00
Rolf Ahrenberg	94225ac6a4	Fixed pid scanner to default MPEG2 video stream type.	2009-03-06 19:30:56 +02:00
Rolf Ahrenberg	25ec9df0cc	Whitespace cleanup.	2009-03-06 19:06:47 +02:00
Rolf Ahrenberg	abf0a5ece4	Refactored section filter class.	2009-02-27 16:05:19 +02:00
Rolf Ahrenberg	024ee7ba89	Optimized TS packet data flow.	2009-02-26 16:04:12 +02:00
Rolf Ahrenberg	73906ab698	Fixed a possible crash in pid scanner.	2009-02-25 22:52:25 +02:00
Rolf Ahrenberg	ec2ec19f68	Fixed a possible crash in sid scanner.	2009-02-25 14:34:19 +02:00
Rolf Ahrenberg	1e8f117988	Updated for vdr-1.7.4. Fixed blacklisting of PAT section filter. Set max IPTV device count to VDR's max devices.	2009-02-24 13:40:16 +02:00
Rolf Ahrenberg	00cf880a5d	Updated HISTORY.	2008-12-16 17:14:45 +02:00
Rolf Ahrenberg	71472a1033	Updated for vdr-1.7.2.	2008-12-14 20:27:45 +02:00
Rolf Ahrenberg	0eff9de2ee	Silenced a warning about ignoring a return value of write().	2008-11-10 12:32:34 +02:00
Rolf Ahrenberg	9a19009451	Cleaned up Makefile header.	2008-11-04 23:29:20 +02:00
Rolf Ahrenberg	04c194ffc7	Incremented the version number.	2008-10-12 23:08:41 +03:00
Rolf Ahrenberg	40125dd9bb	Updated HISTORY for the release.	2008-10-12 22:44:17 +03:00
Rolf Ahrenberg	c5a7598544	Optimized streamer thread termination.	2008-09-10 17:22:36 +03:00
Rolf Ahrenberg	4e8e26a4b3	Updated iptvstream.sh script to support optional video resolution settings.	2008-09-01 14:28:05 +03:00
Rolf Ahrenberg	9ec10262d4	Fifo shouldn't be opened as write-only, if there're no readers.	2008-08-31 12:56:22 +03:00
Rolf Ahrenberg	501701e3d3	Added .gitignore.	2008-08-29 17:38:46 +03:00
Rolf Ahrenberg	53b5644973	Migration changes for git and UTF-8. Updated contact information.	2008-08-23 08:15:30 +03:00
Rolf Ahrenberg	17b4709c30	Tweaked pid scanner parameters for HD broadcasts.	2008-08-06 08:05:52 +00:00
Rolf Ahrenberg	2bff3d0f8f	Updated Italian translation.	2008-07-14 10:13:48 +00:00
Rolf Ahrenberg	6324eaf128	Updated HISTORY.	2008-06-20 19:34:50 +00:00
Rolf Ahrenberg	b31de2ec23	Rephrased.	2008-06-20 19:34:18 +00:00
Rolf Ahrenberg	b3b28a5faa	Initial import.	2008-06-20 19:33:43 +00:00
Rolf Ahrenberg	037adaac86	Added pluginparam patch for vdr-1.7.0.	2008-04-13 16:04:03 +00:00
Rolf Ahrenberg	6fa46ca9e3	Revert non-working retuning optimization.	2008-04-04 20:55:44 +00:00
Rolf Ahrenberg	c507f373ff	Fixed channels.conf format used in vlc2iptv. Disabled retuning feature and added some minor corrections.	2008-04-02 22:55:04 +00:00
Rolf Ahrenberg	e798ff1424	Removed old channels.conf format support and disabled re-tuning of EXT protocol.	2008-04-02 20:22:48 +00:00
Rolf Ahrenberg	613152c6db	Updated Italian translations and incremented version number.	2008-03-30 20:25:12 +00:00
Rolf Ahrenberg	740d93aa2c	Updated russian translation and API dependency.	2008-03-27 20:27:26 +00:00
Rolf Ahrenberg	94e70db977	Updated for vdr-1.6.0.	2008-03-27 20:14:18 +00:00
Rolf Ahrenberg	698ebb3a3c	Updated pluginparam patches.	2008-03-13 23:32:51 +00:00
Rolf Ahrenberg	aaf93246c1	Added Russian translation.	2008-03-13 23:26:04 +00:00
Rolf Ahrenberg	1d8044b4e4	Updated Italian translation.	2008-02-23 12:37:56 +00:00
Rolf Ahrenberg	573584022c	Fixed installation instructions.	2008-02-19 22:32:24 +00:00
Rolf Ahrenberg	5420374543	Removed obsolete patches.	2008-02-19 22:30:43 +00:00
Rolf Ahrenberg	71952ae0dc	Removed support for older vdr versions.	2008-02-19 22:29:02 +00:00
Rolf Ahrenberg	c8fe6b1389	Fixed SetText copy mode.	2008-02-18 16:50:07 +00:00
Rolf Ahrenberg	dd540f8eef	Preparing for 0.0.7 release.	2008-02-18 14:18:11 +00:00
Rolf Ahrenberg	3de5d6c467	Added a note about asprintf to cString modification.	2008-02-18 12:19:46 +00:00
Rolf Ahrenberg	c525b553e4	Updated for vdr-1.5.15.	2008-02-18 11:54:01 +00:00
Rolf Ahrenberg	71b0e52712	Added support for fifo dvr and modificationsfor vdr-1.5.15.	2008-02-17 19:18:47 +00:00
Rolf Ahrenberg	398a8d75b9	Initial import.	2008-02-17 17:16:04 +00:00
Rolf Ahrenberg	554bc5cb41	Modified pid scanner timeout to 15s.	2008-02-02 21:06:14 +00:00
Rolf Ahrenberg	4188a5d4e2	Added check for already known audio pid.	2008-02-02 20:51:47 +00:00
Antti Seppälä	55440bf047	Implement detection of audio or video-only channel pids.	2008-02-02 20:23:44 +00:00
Rolf Ahrenberg	3fe71ae011	Added explanations for scan sid/pids menu entries.	2008-02-02 17:19:12 +00:00
Rolf Ahrenberg	16b40c6774	Reset timeout if channel locking fails.	2008-02-01 21:58:22 +00:00
Rolf Ahrenberg	a03bd6309c	Removed [PS]idScanner setup options and added a timeout mechanism for pid scanner.	2008-02-01 21:54:24 +00:00
Rolf Ahrenberg	89e3aba59e	Added channel specific sid and pid scanning options.	2008-01-31 22:28:53 +00:00
Rolf Ahrenberg	68459e6553	Added preliminary automatic Pid scanning functionality.	2008-01-30 22:41:58 +00:00
Rolf Ahrenberg	29cb25485f	Added some funky moves.	2008-01-30 21:57:33 +00:00
Rolf Ahrenberg	c176429338	Fixed indentation.	2008-01-29 20:50:05 +00:00
Rolf Ahrenberg	05d70f67b1	Modified VDR locale detection.	2008-01-28 22:37:26 +00:00
Rolf Ahrenberg	537c16a43b	Added support for vdr-1.5.14.	2008-01-28 21:36:32 +00:00
Rolf Ahrenberg	b88b14912c	Updated French translation.	2008-01-26 20:45:25 +00:00
Rolf Ahrenberg	c1544453b6	Fixed compilation under vdr-1.4.7.	2008-01-20 16:15:14 +00:00
Rolf Ahrenberg	5c14668598	Updated finnish translations for help.	2008-01-20 14:13:28 +00:00
Rolf Ahrenberg	d4a255a773	Removed.	2008-01-20 14:11:14 +00:00
Antti Seppälä	24bcf25571	Provide some more information in infokey help.	2008-01-20 13:17:36 +00:00
Rolf Ahrenberg	78f4a2a0fc	Initial import.	2008-01-20 00:02:45 +00:00
Rolf Ahrenberg	65d79abbf4	Updated finnish translation.	2008-01-19 23:54:49 +00:00
Rolf Ahrenberg	caf326bb4d	Added help texts.	2008-01-19 23:17:20 +00:00
Antti Seppälä	18c2962cd9	Get rid of bad interface design in statistic collectors.	2008-01-19 21:08:02 +00:00
Rolf Ahrenberg	1e2d0955de	Updated version number to 0.0.6.	2008-01-19 20:24:10 +00:00
Antti Seppälä	27437381d0	Fix compiler warning.	2008-01-19 16:51:59 +00:00
Rolf Ahrenberg	7ce44c9175	Added preliminary help support for setup.	2008-01-19 16:24:40 +00:00
Rolf Ahrenberg	7206a8d189	Translation update.	2008-01-17 18:19:02 +00:00
Rolf Ahrenberg	dce9d3361f	Modified .po headers	2008-01-13 17:10:22 +00:00
Rolf Ahrenberg	d71f79bdd8	Added '-Wno-parentheses' to the compiler options.	2008-01-13 16:45:02 +00:00
Rolf Ahrenberg	dcf7ce5447	Updated translation file headers.	2008-01-11 23:07:29 +00:00
Rolf Ahrenberg	3ae015cf51	Fixed a typo and some reformatting.	2008-01-06 20:19:02 +00:00
Antti Seppälä	4915630cfc	Bug and style fixes.	2008-01-04 23:36:37 +00:00
Rolf Ahrenberg	28d1869a28	Minor corrections.	2007-11-27 19:44:02 +00:00
Rolf Ahrenberg	c8c9dccf2b	Added a release date.	2007-11-27 19:31:46 +00:00
Antti Seppälä	adcde3954c	Switch away from utf-8	2007-11-24 16:44:20 +00:00
Antti Seppälä	c3d38f2345	Add vlc2iptv example script from Tobias Grimm.	2007-11-24 16:34:20 +00:00
Antti Seppälä	8f552bd19f	Add GPL boilerplate	2007-11-24 15:14:52 +00:00
Antti Seppälä	3b5b7eac24	One more consistency change.	2007-11-22 17:36:37 +00:00
Antti Seppälä	3daea8b1ba	Use consistent variable names.	2007-11-22 17:36:00 +00:00
Antti Seppälä	b5744903cd	Add an entry about iptvstream.sh modifications.	2007-11-22 17:33:51 +00:00
Antti Seppälä	61a588ed22	An attempt at more posix compliance in iptvstream.sh.	2007-11-22 17:25:20 +00:00
Rolf Ahrenberg	9e630760f6	Added French translation.	2007-11-08 18:49:40 +00:00
Rolf Ahrenberg	b3b0ae3567	Incremented version number.	2007-11-04 17:07:25 +00:00
Rolf Ahrenberg	4b8b396f6b	Fixed a typo.	2007-11-04 15:31:05 +00:00
Rolf Ahrenberg	19b49e00e5	Modified cMenuEditStrItem for vdr-1.5.11.	2007-11-04 15:23:16 +00:00
Rolf Ahrenberg	bde204f3b3	Updated Makefile 'i18n' targets.	2007-11-04 14:13:11 +00:00
Rolf Ahrenberg	60ed46f42f	Added patch for vdr-1.5.11.	2007-11-04 13:00:23 +00:00
Rolf Ahrenberg	c6671b20db	Incremented version number.	2007-10-29 21:21:39 +00:00
Antti Seppälä	edb54e537d	History file entry about German translation	2007-10-29 21:07:54 +00:00
Antti Seppälä	9750b0f565	Added German translations from Tobias Grimm.	2007-10-29 21:03:24 +00:00