From patchwork Sat Jan 21 12:28:10 2006
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Rolf Ahrenberg <rahrenbe@cc.hut.fi>
X-Patchwork-Id: 12174
Received: from smtp-4.hut.fi ([130.233.228.94])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1F0IvL-00009N-3m
	for vdr@linuxtv.org; Sat, 21 Jan 2006 14:36:59 +0100
Received: from localhost (katosiko.hut.fi [130.233.228.115])
	by smtp-4.hut.fi (8.12.10/8.12.10) with ESMTP id k0LDaHPp013744;
	Sat, 21 Jan 2006 15:36:17 +0200
Received: from smtp-4.hut.fi ([130.233.228.94])
	by localhost (katosiko.hut.fi [130.233.228.115]) (amavisd-new,
	port 10024)
	with LMTP id 32743-05-6; Sat, 21 Jan 2006 15:36:16 +0200 (EET)
Received: from kosh.hut.fi (kosh.hut.fi [130.233.228.10])
	by smtp-4.hut.fi (8.12.10/8.12.10) with ESMTP id k0LCSApc005778;
	Sat, 21 Jan 2006 14:28:10 +0200
Date: Sat, 21 Jan 2006 14:28:10 +0200 (EET)
From: Rolf Ahrenberg <rahrenbe@cc.hut.fi>
To: pekka.virtanen@iki.fi, VDR Mailing List <vdr@linuxtv.org>
Subject: Re: [vdr] [ANNOUNCE] DVB subtitles 0.3.9
In-Reply-To: <663687be0601210139hbbc006dl@mail.gmail.com>
Message-ID: <Pine.OSF.4.61.0601211423390.191184@kosh.hut.fi>
References: <663687be0601210139hbbc006dl@mail.gmail.com>
MIME-Version: 1.0
X-Spam-Checker-Version: SpamAssassin 2.64 (2004-01-11) on katosiko.hut.fi
X-TKK-Virus-Scanned: by amavisd-new-2.1.2-hutcc at katosiko.hut.fi
X-MIME-Autoconverted: from 8bit to quoted-printable by smtp-4.hut.fi id
	k0LDaHPp013744
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jan 2006 13:36:59 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 7356

On Sat, 21 Jan 2006, Pekka Virtanen wrote:

> There is a maintenance release of the DVB subtitles plugin available at:
> http://virtanen.org/vdr/subtitles/
>
> 2006-01-21: Version 0.3.9
> -Compability with VDR versions >= 1.3.38 (Thanks to Ville Skyttä)
> -Patch for VDR-1.3.39 (Thanks to Rolf Ahrenberg)

Satellite users might want to try my subchannels fix patch 
(vdr-subtitles-0.3.9-subchannels-fix.diff) that should prevent erroneus 
streams to be added into subchannels.conf.

BR,
---
rofa

diff -Nru subtitles-0.3.9/subfilter.c subtitles-0.3.9-subchannels-fix/subfilter.c
--- subtitles-0.3.9/subfilter.c	2006-01-21 11:24:18.000000000 +0200
+++ subtitles-0.3.9-subchannels-fix/subfilter.c	2006-01-21 13:25:04.000000000 +0200
@@ -169,11 +169,13 @@
      free(buffer);

      asprintf(&buffer, "%s:%d:", *channelId.ToString(), userLanguage);
+    bool found = false;
      bool first = true;
      for (tSubtitleStream* stream = streams.First(); stream; stream = streams.Next(stream))
      {
  	if (stream->languageIndex != -1)
  	{
+	    found = true;
  	    char* buffer2 = NULL;
  	    asprintf(&buffer2, first?"%s%s":"%s,%s",buffer,stream->ToString());
  	    free(buffer);
@@ -181,6 +183,9 @@
  	    first = false;
  	}
      }
+    if (!found)
+	return NULL;
+
      return buffer;
  }