From patchwork Sat Jun 30 17:21:51 2007
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Matthias Schwarzott <zzam@gentoo.org>
X-Patchwork-Id: 12484
Received: from mail-out.m-online.net ([212.18.0.10])
	by www.linuxtv.org with esmtp (Exim 4.63)
	(envelope-from <zzam@gentoo.org>) id 1I4gdv-0007t3-V2
	for vdr@linuxtv.org; Sat, 30 Jun 2007 19:21:55 +0200
Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149])
	by mail-out.m-online.net (Postfix) with ESMTP id 7C47C2475BA
	for <vdr@linuxtv.org>; Sat, 30 Jun 2007 19:21:37 +0200 (CEST)
Received: from gauss.x.fun (DSL01.83.171.145.90.ip-pool.NEFkom.net
	[83.171.145.90])
	by mail.nefkom.net (Postfix) with ESMTP id 1587791184
	for <vdr@linuxtv.org>; Sat, 30 Jun 2007 19:21:53 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by gauss.x.fun (Postfix) with ESMTP id A124AF1F5D
	for <vdr@linuxtv.org>; Sat, 30 Jun 2007 19:21:52 +0200 (CEST)
From: Matthias Schwarzott <zzam@gentoo.org>
To: vdr@linuxtv.org
Date: Sat, 30 Jun 2007 19:21:51 +0200
User-Agent: KMail/1.9.7
MIME-Version: 1.0
Message-Id: <200706301921.51743.zzam@gentoo.org>
Subject: [vdr] [PATCH] vdr-burn-0.1.0_pre21 using correct charset with
	>=vdr-1.5.3
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.9
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, 30 Jun 2007 17:21:56 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 13420

Hi there!

The attached patch lets vdr-burn-0.1.0_pre21 use the correct charset that vdr 
itself uses. This stops vdr-burn to double utf8 encode texts.

Matthias

Index: burn-0.1.0-pre21/burn.c
===================================================================
--- burn-0.1.0-pre21.orig/burn.c
+++ burn-0.1.0-pre21/burn.c
@@ -45,8 +45,13 @@ namespace vdr_burn
 
 	string plugin::get_character_encoding()
 	{
-#ifdef UTF8PATCH
-		return "utf8";
+#if VDRVERSNUM >= 10503
+		if (cCharSetConv::SystemCharacterTable())
+			return cCharSetConv::SystemCharacterTable();
+		else
+			return "utf-8";
+#elif defined(UTF8PATCH)
+		return "utf-8";
 #else
 		return tr("iso8859-15");
 #endif