r3566 - in vdr/vdr-plugin-mp3/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2006-10-18 22:45:27 +0000 (Wed, 18 Oct 2006)
New Revision: 3566

Added:
   vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch
Modified:
   vdr/vdr-plugin-mp3/trunk/debian/changelog
   vdr/vdr-plugin-mp3/trunk/debian/patches/00list
Log:
Added 01_mp3-ogg-conv-utf8.dpatch

Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog	2006-10-17 15:46:55 UTC (rev 3565)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog	2006-10-18 22:45:27 UTC (rev 3566)
@@ -1,3 +1,10 @@
+vdr-plugin-mp3 (0.9.15-4) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 01_mp3-ogg-conv-utf8.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 19 Oct 2006 00:31:55 +0200
+
 vdr-plugin-mp3 (0.9.15-3) unstable; urgency=medium
 
   * Urgency medium because it fixes a RC-bug
@@ -278,7 +285,7 @@
     - Use dh_install
     - Changed maintainer to Debian VDR and DVB Packaging Team 
       <pkg-vdr-dvb-devel at lists.alioth.debian.org>
-    - Added patchlevel-mechanism, to be compatible with c't-vdr		
+    - Added patchlevel-mechanism, to be compatible with c't-vdr
     - Added watch-file
     - Added /etc/vdr/plugins/mp3sources.conf and link to 
       /var/lib/vdr/plugins
@@ -405,7 +412,7 @@
 vdr-plugin-mp3 (0.7.8-5) unstable; urgency=low
 
   * changed debian/rules, so that patching the upstrams makefile is not
-	 nessessary anymore 
+    necessary anymore
 
  -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>  Wed, 11 Dec 2002 22:22:55 +0100
 

Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list	2006-10-17 15:46:55 UTC (rev 3565)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/00list	2006-10-18 22:45:27 UTC (rev 3566)
@@ -1 +1,2 @@
+01_mp3-ogg-conv-utf8
 10_debian-fhs-defaults

Added: vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch	                        (rev 0)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch	2006-10-18 22:45:27 UTC (rev 3566)
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run 
+## 01_mp3-ogg-conv-utf8.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/mp3-0.9.15-ogg-conv-utf8.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Converts ogginfos from utf8 to the setup charset.
+
+ at DPATCH@
+--- mp3-0.9.15/decoder-ogg.c
++++ mp3-0.9.15/decoder-ogg.c
+@@ -28,6 +28,28 @@
+ #include "common.h"
+ #include "decoder-ogg.h"
+ 
++#include <vdr/config.h>
++#include <vdr/i18n.h>
++#include <iconv.h>
++static char *ConvertFromUTF8(const char *text)
++{
++  if (!text) return NULL;
++  char *buffer = strdup(text);
++  iconv_t ic = iconv_open(I18nCharSets()[Setup.OSDLanguage], "UTF8");
++  if (ic >= 0) {
++     char *in = (char *)text;
++     char *out = buffer;
++     size_t inbytesleft = strlen(text);
++     size_t outbytesleft = inbytesleft;
++     if (iconv(ic, &in, &inbytesleft, &out, &outbytesleft) != (size_t)(-1))
++        *out = 0;
++     else
++        strcpy(buffer, text);
++     iconv_close(ic);
++     }
++  return buffer;
++}
++
+ // --- cOggFile ----------------------------------------------------------------
+ 
+ cOggFile::cOggFile(const char *Filename)
+@@ -166,13 +188,13 @@
+         const int len=p-cc;
+         p++;
+         if(!strncasecmp(cc,"TITLE",len)) {
+-          if(!Title) Title=strdup(p);
++          if(!Title) Title=ConvertFromUTF8(p);
+           }
+         else if(!strncasecmp(cc,"ARTIST",len)) {
+-          if(!Artist) Artist=strdup(p);
++          if(!Artist) Artist=ConvertFromUTF8(p);
+           }
+         else if(!strncasecmp(cc,"ALBUM",len)) {
+-          if(!Album) Album=strdup(p);
++          if(!Album) Album=ConvertFromUTF8(p);
+           }
+         else if(!strncasecmp(cc,"YEAR",len)) {
+           if(Year<0) {