Updated HISTORY.

HISTORY

@@ -34,7 +34,7 @@ VDR Plugin 'iptv' Revision History
 2008-01-20: Version 0.0.6
 
 - Fixed some lint warnings.
-- Added Italian translation (Thanks to Gringo).
+- Added Italian translation (Thanks to Diego Pierotto).
 - Added '-Wno-parentheses' to the compiler options.
 - Mapped 'kInfo' as help key in setup menu.
 - Refactored statistic collecting code.
@@ -53,5 +53,13 @@ VDR Plugin 'iptv' Revision History
 2008-03-27: Version 0.2.0
 
 - Updated for vdr-1.6.0.
-- Updated Italian translation (Thanks to Gringo).
+- 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.

device.c

@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: device.c,v 1.85 2008/02/19 22:29:02 rahrenbe Exp $
+ * $Id: device.c,v 1.87 2008/04/02 22:55:04 rahrenbe Exp $
  */
 
 #include "config.h"
@@ -225,30 +225,6 @@ cString cIptvDevice::GetChannelSettings(const char *IptvParam, int *Parameter, i
         return locstr;
         }
      }
-  // compatibility mode for old channels.conf format
-  else if (sscanf(IptvParam, "%a[^|]|%a[^|]|%a[^|]|%u", &tag, &proto, &loc, Parameter) == 4) {
-     cString tagstr(tag, true);
-     cString protostr(proto, true);
-     cString locstr(loc, true);
-     *SidScan = 0;
-     *PidScan = 0;
-     // check if IPTV tag
-     if (strncasecmp(*tagstr, "IPTV", 4) == 0) {
-        // check if protocol is supported and update the pointer
-        if (strncasecmp(*protostr, "UDP", 3) == 0)
-           *Protocol = pUdpProtocol;
-        else if (strncasecmp(*protostr, "HTTP", 4) == 0)
-           *Protocol = pHttpProtocol;
-        else if (strncasecmp(*protostr, "FILE", 4) == 0)
-           *Protocol = pFileProtocol;
-        else if (strncasecmp(*protostr, "EXT", 3) == 0)
-           *Protocol = pExtProtocol;
-        else
-           return NULL;
-        // return location
-        return locstr;
-        }
-     }
   return NULL;
 }
 
@@ -302,11 +278,12 @@ bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      }
   sidScanEnabled = sidscan ? true : false;
   pidScanEnabled = pidscan ? true : false;
-  pIptvStreamer->Set(location, parameter, deviceIndex, protocol);
-  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
-     pSidScanner->SetChannel(Channel);
-  if (pidScanEnabled && pPidScanner)
-     pPidScanner->SetChannel(Channel);
+  if (pIptvStreamer->Set(location, parameter, deviceIndex, protocol)) {
+     if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+        pSidScanner->SetChannel(Channel);
+     if (pidScanEnabled && pPidScanner)
+        pPidScanner->SetChannel(Channel);
+     }
   return true;
 }
 
@@ -394,7 +371,7 @@ bool cIptvDevice::OpenDvr(void)
 void cIptvDevice::CloseDvr(void)
 {
   debug("cIptvDevice::CloseDvr(%d)\n", deviceIndex);
-  if (pidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
+  if (sidScanEnabled && pSidScanner && IptvConfig.GetSectionFiltering())
      pSidScanner->SetStatus(false);
   if (pIptvStreamer)
      pIptvStreamer->Close();
@@ -459,7 +436,7 @@ bool cIptvDevice::GetTSPacket(uchar *&Data)
            write(dvrFd, p, TS_SIZE);
         // Analyze incomplete streams with built-in pid analyzer
         if (pidScanEnabled && pPidScanner)
-            pPidScanner->Process(p);
+           pPidScanner->Process(p);
         // Run the data through all filters
         for (unsigned int i = 0; i < eMaxSecFilterCount; ++i) {
             if (secfilters[i])

iptv.c

@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: iptv.c,v 1.38 2008/03/27 20:27:26 rahrenbe Exp $
+ * $Id: iptv.c,v 1.39 2008/03/30 20:25:12 rahrenbe Exp $
  */
 
 #include <getopt.h>
@@ -21,7 +21,7 @@
 #error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-static const char VERSION[]     = "0.2.0";
+static const char VERSION[]     = "0.2.1";
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {

iptv/internetradio.sh

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

iptv/iptvstream.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# iptvstream.sh can be used by the VDR iptv plug-in to transcode external
+# iptvstream.sh can be used by the VDR iptv plugin to transcode external
 # sources
 #
 # (C) 2007 Rolf Ahrenberg, Antti Sepp<70>l<EFBFBD>

iptv/linein.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# linein.sh is used by the VDR iptv plugin to transcode line-in of
+# a soundcard.
+#
+# The script originates from:
+# http://www.vdr-wiki.de/wiki/index.php/Iptv-plugin
+#
+# An example channels.conf entry:
+# linein;IPTV:5:IPTV|S0P0|EXT|linein.sh|0:P:27500:0:256:0:0:5:5:5:0
+#
+# linein.sh is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this package; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+if [ $# -ne 2 ]; then
+    logger "$0: error: Invalid parameter count '$#' $*"
+    exit 1;
+fi
+
+# Channels.conf parameter
+PARAMETER=${1}
+
+# Iptv plugin listens this port
+PORT=${2}
+
+# Stream configuration
+TITLE="linein"
+
+# Stream temporary files
+LOG=/dev/null
+
+{
+# PID 0x100/256 = Audio
+arecord -q -D hw:0,0 -f dat | \
+ffmpeg -v -1 \
+ -f wav \
+ -i - \
+ -title "${TITLE}" \
+ -f mpegts -acodec mp2 -ac 2 -ab 128k -ar 48000 \
+ - | nc -nu 127.0.0.1 ${PORT}
+} > ${LOG} 2>&1

iptv/vlc2iptv

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# vlc2iptv is used by the VDR iptv plug-in to transcode external sources
+# vlc2iptv is used by the VDR iptv plugin to transcode external sources
 #
 # (C) 2007 Rolf Ahrenberg, Antti Sepp<70>l<EFBFBD>
 # (C) 2007 Tobias Grimm
@@ -52,7 +52,7 @@ lookup_channel_and_pids()
     [ ! -e "$CHANNELS_CONF" ] && \
       exit_with_error "channels.conf not found ($CHANNELS_CONF)"
 
-    local CHANNEL_RECORD=`grep ":IPTV|EXT|vlc2iptv|$PARAMETER:" $CHANNELS_CONF`
+    local CHANNEL_RECORD=`grep "[:]IPTV[|][SP][10][SP][10][|]EXT[|]vlc2iptv[|]$PARAMETER[:]" $CHANNELS_CONF`
     [ -z "$CHANNEL_RECORD" ] && \
       exit_with_error "no iptv channel with parameter $PARAMETER found"
 

iptv/webcam.sh

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

patches/vdr-1.7.0-pluginparam.patch

@@ -0,0 +1,287 @@
+diff -Nru vdr-1.7.0-vanilla/channels.c vdr-1.7.0-pluginparam/channels.c
+--- vdr-1.7.0-vanilla/channels.c	2008-04-12 16:49:12.000000000 +0300
++++ vdr-1.7.0-pluginparam/channels.c	2008-04-13 18:58:41.000000000 +0300
+@@ -216,6 +216,7 @@
+   shortName = strdup("");
+   provider = strdup("");
+   portalName = strdup("");
++  pluginParam = strdup("");
+   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
+   inversion    = DVBFE_INVERSION_AUTO;
+   bandwidth    = DVBFE_BANDWIDTH_AUTO;
+@@ -241,6 +242,7 @@
+   shortName = NULL;
+   provider = NULL;
+   portalName = NULL;
++  pluginParam = NULL;
+   schedule     = NULL;
+   linkChannels = NULL;
+   refChannel   = NULL;
+@@ -269,6 +271,7 @@
+   free(shortName);
+   free(provider);
+   free(portalName);
++  free(pluginParam);
+ }
+ 
+ cChannel& cChannel::operator= (const cChannel &Channel)
+@@ -277,6 +280,7 @@
+   shortName = strcpyrealloc(shortName, Channel.shortName);
+   provider = strcpyrealloc(provider, Channel.provider);
+   portalName = strcpyrealloc(portalName, Channel.portalName);
++  pluginParam = strcpyrealloc(pluginParam, Channel.pluginParam);
+   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
+   return *this;
+ }
+@@ -338,9 +342,26 @@
+      alpha        = Channel->alpha;
+      priority     = Channel->priority;
+      rollOff      = Channel->rollOff;
++     if (IsPlug())  pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam);
+      }
+ }
+ 
++bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam)
++{
++  if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) {
++     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, int Modulation, int System, int RollOff)
+ {
+   // Workarounds for broadcaster stupidity:
+@@ -472,6 +493,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
+ 
+@@ -665,7 +698,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);
+@@ -681,6 +714,7 @@
+   ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
+   ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
+   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
++  ST("P  ")  snprintf(buffer, sizeof(buffer), "%s", pluginParam);
+   return buffer;
+ }
+ 
+@@ -702,7 +736,7 @@
+ 
+ bool cChannel::StringToParameters(const char *s)
+ {
+-  while (s && *s) {
++  while (s && *s && !IsPlug()) {
+         switch (toupper(*s)) {
+           case 'A': s = ParseParameter(s, alpha, AlphaValues); break;
+           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
+@@ -817,7 +851,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)
+@@ -908,6 +942,7 @@
+            shortName = strcpyrealloc(shortName, p);
+            }
+         name = strcpyrealloc(name, namebuf);
++        if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, parambuf);
+ 
+         free(parambuf);
+         free(sourcebuf);
+diff -Nru vdr-1.7.0-vanilla/channels.h vdr-1.7.0-pluginparam/channels.h
+--- vdr-1.7.0-vanilla/channels.h	2008-04-12 16:46:50.000000000 +0300
++++ vdr-1.7.0-pluginparam/channels.h	2008-04-13 18:57:08.000000000 +0300
+@@ -118,6 +118,7 @@
+   char *shortName;
+   char *provider;
+   char *portalName;
++  char *pluginParam;
+   int __BeginData__;
+   int frequency; // MHz
+   int source;
+@@ -174,6 +175,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; }
+@@ -212,6 +214,7 @@
+   int RollOff(void) const { return rollOff; }
+   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
+   const cChannel *RefChannel(void) const { return refChannel; }
++  bool IsPlug(void) const { return cSource::IsPlug(source); }
+   bool IsCable(void) const { return cSource::IsCable(source); }
+   bool IsSat(void) const { return cSource::IsSat(source); }
+   bool IsTerr(void) const { return cSource::IsTerr(source); }
+@@ -219,12 +222,14 @@
+   bool HasTimer(void) const;
+   int Modification(int Mask = CHANNELMOD_ALL);
+   void CopyTransponderData(const cChannel *Channel);
++  bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam);
+   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff);
+   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
+   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, int Alpha, int Priority);
+   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
+   void SetName(const char *Name, const char *ShortName, const char *Provider);
+   void SetPortalName(const char *PortalName);
++  void SetPluginParam(const char *PluginParam);
+   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+   void SetCaIds(const int *CaIds); // list must be zero-terminated
+   void SetCaDescriptors(int Level);
+diff -Nru vdr-1.7.0-vanilla/config.h vdr-1.7.0-pluginparam/config.h
+--- vdr-1.7.0-vanilla/config.h	2008-04-12 16:02:10.000000000 +0300
++++ vdr-1.7.0-pluginparam/config.h	2008-04-13 18:54:25.000000000 +0300
+@@ -30,6 +30,8 @@
+ #define APIVERSION  "1.7.0"
+ #define APIVERSNUM   10700  // 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.7.0-vanilla/menu.c vdr-1.7.0-pluginparam/menu.c
+--- vdr-1.7.0-vanilla/menu.c	2008-04-12 14:37:17.000000000 +0300
++++ vdr-1.7.0-pluginparam/menu.c	2008-04-13 18:56:07.000000000 +0300
+@@ -189,6 +189,7 @@
+   cChannel *channel;
+   cChannel data;
+   char name[256];
++  char pluginParam[256];
+   void Setup(void);
+ public:
+   cMenuEditChannel(cChannel *Channel, bool New = false);
+@@ -221,6 +222,7 @@
+ 
+   // Parameters for all types of sources:
+   strn0cpy(name, data.name, sizeof(name));
++  strn0cpy(pluginParam, data.pluginParam, sizeof(pluginParam));
+   Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name)));
+   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
+   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
+@@ -255,6 +257,7 @@
+   ST("  T")  Add(new cMenuEditMapItem( tr("Alpha"),        &data.alpha,        AlphaValues));
+   ST("  T")  Add(new cMenuEditMapItem( tr("Priority"),     &data.priority,     PriorityValues));
+   ST(" S ")  Add(new cMenuEditMapItem( tr("Rolloff"),      &data.rollOff,      RollOffValues));
++  ST("P  ")  Add(new cMenuEditStrItem( tr("Parameters"),    pluginParam, sizeof(pluginParam), tr(FileNameChars)));
+ 
+   SetCurrent(Get(current));
+   Display();
+@@ -269,6 +272,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.7.0-vanilla/po/fi_FI.po vdr-1.7.0-pluginparam/po/fi_FI.po
+--- vdr-1.7.0-vanilla/po/fi_FI.po	2008-04-13 17:16:58.000000000 +0300
++++ vdr-1.7.0-pluginparam/po/fi_FI.po	2008-04-13 18:54:25.000000000 +0300
+@@ -1019,3 +1019,6 @@
+ #, c-format
+ msgid "VDR will shut down in %s minutes"
+ msgstr "VDR sammuu %s minuutin kuluttua"
++
++msgid "Parameters"
++msgstr "Parametrit"
+diff -Nru vdr-1.7.0-vanilla/po/fr_FR.po vdr-1.7.0-pluginparam/po/fr_FR.po
+--- vdr-1.7.0-vanilla/po/fr_FR.po	2008-04-13 17:16:58.000000000 +0300
++++ vdr-1.7.0-pluginparam/po/fr_FR.po	2008-04-13 18:54:25.000000000 +0300
+@@ -1022,3 +1022,6 @@
+ #, c-format
+ msgid "VDR will shut down in %s minutes"
+ msgstr "VDR s'arr<72>tera dans %s minutes"
++
++msgid "Parameters"
++msgstr "Param<61>tres"
+diff -Nru vdr-1.7.0-vanilla/sources.c vdr-1.7.0-pluginparam/sources.c
+--- vdr-1.7.0-vanilla/sources.c	2008-02-10 16:07:26.000000000 +0200
++++ vdr-1.7.0-pluginparam/sources.c	2008-04-13 18:54:25.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.7.0-vanilla/sources.conf vdr-1.7.0-pluginparam/sources.conf
+--- vdr-1.7.0-vanilla/sources.conf	2007-02-17 18:15:13.000000000 +0200
++++ vdr-1.7.0-pluginparam/sources.conf	2008-04-13 18:54:25.000000000 +0300
+@@ -188,3 +188,7 @@
+ # Terrestrial
+ 
+ T       Terrestrial
++
++# Plugin
++
++P       Plugin
+diff -Nru vdr-1.7.0-vanilla/sources.h vdr-1.7.0-pluginparam/sources.h
+--- vdr-1.7.0-vanilla/sources.h	2005-05-14 12:30:41.000000000 +0300
++++ vdr-1.7.0-pluginparam/sources.h	2008-04-13 18:54:25.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; }

pidscanner.c

@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pidscanner.c,v 1.6 2008/02/02 21:06:14 rahrenbe Exp $
+ * $Id: pidscanner.c,v 1.7 2008/04/02 22:55:04 rahrenbe Exp $
  */
 
 #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_APID_COUNT      10    /* minimum count of audio pid samples for pid detection */
 #define PIDSCANNER_VPID_COUNT      10    /* minimum count of video pid samples for pid detection */
 #define PIDSCANNER_PID_DELTA_COUNT 50    /* minimum count of pid samples for audio/video only pid detection */
 
@@ -92,29 +92,29 @@ void cPidScanner::Process(const uint8_t* buf)
            // Stream ID
            if ((sid >= 0xC0) && (sid <= 0xDF)) {
               if (pid < Apid) {
-                 debug("Found lower Apid: 0x%X instead of 0x%X\n", pid, Apid);
+                 debug("cPidScanner::Process: Found lower Apid: 0x%X instead of 0x%X\n", pid, Apid);
                  Apid = pid;
                  numApids = 1;
                  }
               else if (pid == Apid) {
                  ++numApids;
-                 debug("Incrementing Apids, now at %d\n", numApids);
+                 debug("cPidScanner::Process: Incrementing Apids, now at %d\n", numApids);
                  }
               }
            else if ((sid >= 0xE0) && (sid <= 0xEF)) {
               if (pid < Vpid) {
-                 debug("Found lower Vpid: 0x%X instead of 0x%X\n", pid, Vpid);
+                 debug("cPidScanner::Process: Found lower Vpid: 0x%X instead of 0x%X\n", pid, Vpid);
                  Vpid = pid;
                  numVpids = 1;
                  }
               else if (pid == Vpid) {
                  ++numVpids;
-                 debug("Incrementing Vpids, now at %d\n", numVpids);
+                 debug("cPidScanner::Process: Incrementing Vpids, now at %d\n", numVpids);
                  }
               }
            }
-        if (((numVpids > PIDSCANNER_VPID_COUNT) && (numApids > PIDSCANNER_APID_COUNT)) ||
-            (abs(numApids - numVpids) > PIDSCANNER_PID_DELTA_COUNT)) {
+        if (((numVpids >= PIDSCANNER_VPID_COUNT) && (numApids >= PIDSCANNER_APID_COUNT)) ||
+            (abs(numApids - numVpids) >= PIDSCANNER_PID_DELTA_COUNT)) {
            // Lock channels for pid updates
            if (!Channels.Lock(true, 10)) {
               timeout.Set(PIDSCANNER_TIMEOUT_IN_MS);
@@ -130,9 +130,9 @@ void cPidScanner::Process(const uint8_t* buf)
            int Ppid = IptvChannel->Ppid();
            int Tpid = IptvChannel->Tpid();
            bool foundApid = false;
-           if (numVpids <= PIDSCANNER_VPID_COUNT)
+           if (numVpids < PIDSCANNER_VPID_COUNT)
               Vpid = 0; // No detected video pid
-           else if (numApids <= PIDSCANNER_APID_COUNT)
+           else if (numApids < PIDSCANNER_APID_COUNT)
               Apid = 0; // No detected audio pid
            for (unsigned int i = 1; i < MAXAPIDS; ++i) {
                Apids[i] = IptvChannel->Apid(i);

po/it_IT.po

@@ -1,15 +1,15 @@
 # VDR plugin language source file.
 # Copyright (C) 2007 Rolf Ahrenberg & Antti Seppala
 # This file is distributed under the same license as the iptv package.
-# Gringo <vdr-italian@tiscali.it>, 2008.
+# Diego Pierotto <vdr-italian@tiscali.it>, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: iptv 0.2.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-02-01 23:43+0200\n"
-"PO-Revision-Date: 2008-02-22 02:08+0100\n"
-"Last-Translator: Gringo <vdr-italian@tiscali.it>\n"
+"PO-Revision-Date: 2008-03-30 05:26+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -38,7 +38,7 @@ msgid "TDT (0x70)"
 msgstr "TDT (0x70)"
 
 msgid "Experience the IPTV"
-msgstr "Esperimenta la IPTV"
+msgstr "Scopri la IPTV"
 
 msgid "UDP"
 msgstr "UDP"
@@ -117,19 +117,19 @@ msgid ""
 "\n"
 "Smaller sizes help memory consumption, but are more prone to buffer overflows."
 msgstr ""
-"Definisce una dimensione del buffer in megabytes per i flussi di trasporto.\n"
+"Definisci una dimensione del buffer in MB per i flussi di trasporto.\n"
 "\n"
 "Dimensioni più piccole aiutano il consumo di memoria, ma sono più inclini a generare buffer overflows."
 
 msgid "TS buffer prefill ratio [%]"
-msgstr "Percentuale preriempimento buffer TS [%]"
+msgstr "Percentuale 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 ""
-"Definisce un rapporto di preriempimento del buffer per i flussi di trasporto prima che i dati siano trasferiti a VDR.\n"
+"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."
 
@@ -141,7 +141,7 @@ msgid ""
 "\n"
 "The port range is defined by the number of IPTV devices. This setting sets the port which is listened for connections from external applications when using the EXT protocol."
 msgstr ""
-"Definisce una porta base usata dal protocollo EXT.\n"
+"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."
 
@@ -154,7 +154,7 @@ msgid ""
 "Section filtering means that IPTV plugin tries to parse and provide VDR with secondary data about the currently active stream. VDR can then use this data for providing various functionalities such as automatic pid change detection and EPG etc.\n"
 "Enabling this feature does not affect streams that do not contain section data."
 msgstr ""
-"Definisce se la sezione filtri sarà utilizzata.\n"
+"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."
@@ -167,7 +167,7 @@ msgid ""
 "\n"
 "Certain section filters might cause some unwanted behaviour to VDR such as time being falsely synchronized. By black-listing the filters here useful section data can be left intact for VDR to process."
 msgstr ""
-"Definisce che il numero di sezione filtri sarà disabilitato.\n"
+"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."
 
@@ -176,7 +176,8 @@ msgid "Disable filter"
 msgstr "Disabilita filtro"
 
 msgid "Define an ill-behaving filter to be blacklisted."
-msgstr "Definisce che un filtro corrotto sia messo nella lista nera."
+msgstr "Definisci un filtro corrotto che sarà messo nella lista nera."
 
 msgid "Help"
 msgstr "Aiuto"
+

protocolhttp.c

@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: protocolhttp.c,v 1.24 2008/02/17 19:18:47 rahrenbe Exp $
+ * $Id: protocolhttp.c,v 1.25 2008/04/02 22:55:04 rahrenbe Exp $
  */
 
 #include <sys/types.h>
@@ -34,7 +34,6 @@ cIptvProtocolHttp::~cIptvProtocolHttp()
   // Free allocated memory
   free(streamPath);
   free(streamAddr);
-
 }
 
 bool cIptvProtocolHttp::Connect(void)
@@ -237,7 +236,7 @@ bool cIptvProtocolHttp::Set(const char* Location, const int Parameter, const int
      else
         streamPath = strcpyrealloc(streamPath, "/");
      socketPort = Parameter;
-     debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
+     //debug("http://%s:%d%s\n", streamAddr, socketPort, streamPath);
      // Re-connect the socket
      Connect();
      }

setup.c

@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c,v 1.57 2008/02/19 22:29:02 rahrenbe Exp $
+ * $Id: setup.c,v 1.58 2008/04/02 20:22:48 rahrenbe Exp $
  */
 
 #include <string.h>
@@ -117,29 +117,6 @@ cString cIptvMenuEditChannel::GetIptvSettings(const char *Param, int *Parameter,
         return locstr;
         }
      }
-  else if (sscanf(Param, "%a[^|]|%a[^|]|%a[^|]|%d", &tag, &proto, &loc, Parameter) == 4) {
-     cString tagstr(tag, true);
-     cString protostr(proto, true);
-     cString locstr(loc, true);
-     *SidScan = 0;
-     *PidScan = 0;
-     // check if IPTV tag
-     if (strncasecmp(*tagstr, "IPTV", 4) == 0) {
-        // check if protocol is supported and update the pointer
-        if (strncasecmp(*protostr, "UDP", 3) == 0)
-           *Protocol = eProtocolUDP;
-        else if (strncasecmp(*protostr, "HTTP", 4) == 0)
-           *Protocol = eProtocolHTTP;
-        else if (strncasecmp(*protostr, "FILE", 4) == 0)
-           *Protocol = eProtocolFILE;
-        else if (strncasecmp(*protostr, "EXT", 3) == 0)
-           *Protocol = eProtocolEXT;
-        else
-           return NULL;
-        // return location
-        return locstr;
-        }
-     }
   return NULL;
 }
 

streamer.c

@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: streamer.c,v 1.30 2008/01/30 21:57:33 rahrenbe Exp $
+ * $Id: streamer.c,v 1.33 2008/04/04 20:55:44 rahrenbe Exp $
  */
 
 #include <vdr/thread.h>
@@ -76,12 +76,11 @@ bool cIptvStreamer::Close(void)
   // where thread Action() may be in the process of accessing the protocol.
   // Taking a mutex serializes the Close() and Action() -calls.
   if (mutex)
-      mutex->Lock();
+     mutex->Lock();
   if (protocol)
      protocol->Close();
   if (mutex)
      mutex->Unlock();
-
   return true;
 }
 

streamer.h

@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: streamer.h,v 1.14 2008/01/30 21:57:33 rahrenbe Exp $
+ * $Id: streamer.h,v 1.16 2008/04/04 20:55:44 rahrenbe Exp $
  */
 
 #ifndef __IPTV_STREAMER_H