From 07cb89d82ee6db5f1a6f8d501c9dc597086c185b Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Sun, 16 Sep 2007 16:03:24 +0000
Subject: [PATCH] Updated README and translations. Fixed double free.

---
 README      |  9 ++++-----
 device.c    |  5 +----
 po/fi_FI.po | 12 ++++++------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/README b/README
index 0e810b4..7bbb03a 100644
--- a/README
+++ b/README
@@ -35,20 +35,19 @@ make
 make plugins
 ./vdr -P iptv
 
-Channels.conf example:
+Channels.conf examples:
 
 TV1;IPTV:1:IPTV|UDP|192.168.0.1|1234:P:27500:512:650:2321:0:17:8438:4097:0
          ^ ^    ^   ^           ^    ^
          | |    |   |           |    Source type ("P")
          | |    |   |           IP Port Number
-         | |    |   IP Address
-         | |    Protocol ("UDP")
+         | |    |   IP Address / Location
+         | |    Protocol ("UDP", "HTTP", "FILE")
          | Plugin ID ("IPTV")
          Unique enumeration
 
 TV2;IPTV:2:IPTV|HTTP|127.0.0.1/TS/2|8080:P:27500:513:660:2321:0:33:8438:4097:0
-TV3;IPTV:2:IPTV|FILE|/media/video.ts|8080:P:27500:513:660:2321:0:33:8438:4097:0
-
+TV3;IPTV:2:IPTV|FILE|/media/video.ts|0:P:27500:513:660:2321:0:33:8438:4097:0
 
 Example UDP multicast configuration for iptables firewall:
 
diff --git a/device.c b/device.c
index 8d864b9..e0046fd 100644
--- a/device.c
+++ b/device.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: device.c,v 1.21 2007/09/16 13:44:09 rahrenbe Exp $
+ * $Id: device.c,v 1.22 2007/09/16 16:03:24 rahrenbe Exp $
  */
 
 #include "common.h"
@@ -81,19 +81,16 @@ cString cIptvDevice::GetChannelSettings(const char *Param, int *IpPort, cIptvPro
   char *loc = NULL;
   if (sscanf(Param, "IPTV|UDP|%a[^|]|%u", &loc, IpPort) == 2) {
      cString addr(loc, true);
-     free(loc);
      *Protocol = pUdpProtocol;
      return addr;
      }
   else if (sscanf(Param, "IPTV|HTTP|%a[^|]|%u", &loc, IpPort) == 2) {
      cString addr(loc, true);
-     free(loc);
      *Protocol = pHttpProtocol;
      return addr;
      }
   else if (sscanf(Param, "IPTV|FILE|%a[^|]|%u", &loc, IpPort) == 2) {
      cString addr(loc, true);
-     free(loc);
      *Protocol = pFileProtocol;
      return addr;
      }
diff --git a/po/fi_FI.po b/po/fi_FI.po
index b9aa2a2..9faeab5 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-09-16 16:35+0300\n"
+"POT-Creation-Date: 2007-09-16 16:48+0300\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -19,22 +19,22 @@ msgstr ""
 msgid "Experiment the IPTV"
 msgstr "Koe IPTV:n ihmeellinen maailma"
 
-#: setup.c:28
+#: setup.c:32
 msgid "TS buffer size [MB]"
 msgstr "TS-puskurin koko [MB]"
 
-#: setup.c:29
+#: setup.c:33
 msgid "TS buffer prefill ratio [%]"
 msgstr "TS-puskurin esitäyttöaste [%]"
 
-#: setup.c:30
+#: setup.c:34
 msgid "UDP buffer size [packets]"
 msgstr "UDP-puskurin koko [pakettia]"
 
-#: setup.c:31
+#: setup.c:35
 msgid "HTTP buffer size [packets]"
 msgstr "HTTP-puskurin koko [pakettia]"
 
-#: setup.c:32
+#: setup.c:36
 msgid "FILE buffer size [packets]"
 msgstr "FILE-puskurin koko [pakettia]"