View Single Post
Old 29 December 2004, 11:26 pm   #6
kuniklo
Senior Member
 
kuniklo's Avatar
 
Join Date: Aug 2004
Location: Emeryville, CA
Posts: 52
Default

Also, here's the glib -> iconv patch for the current xmms-musepack-1.1, if we want to release an updated version without waiting for the new C libmusepack.

diff -ru xmms-musepack-1.1/src/libmpc.cpp xmms-musepack-1.1-patched/src/libmpc.cpp
--- xmms-musepack-1.1/src/libmpc.cpp 2004-11-28 08:15:57.000000000 -0800
+++ xmms-musepack-1.1-patched/src/libmpc.cpp 2004-12-29 15:21:10.810832296 -0800
@@ -12,6 +12,7 @@
}
#include <glib.h>
#include <gtk/gtk.h>
+#include <iconv.h>
#include <math.h>
#include "tags.h"
#include "equalizer.h"
@@ -115,12 +116,28 @@
}
#endif

-static char* convertUTF8toLocale(char* utf8) {
- char* temp=g_locale_from_utf8 (utf8, -1, NULL, NULL, NULL);
- if(temp==NULL)
- return g_strdup(utf8);
- else
- return temp;
+static char*
+convertUTF8toLocale(char* utf8)
+{
+ // note - opens a new iconv descriptor for each call
+ // will have to find a way to reuse the descriptor if this turns
+ // out to be too slow
+ iconv_t idesc = iconv_open("", "UTF-8");
+ if (idesc == (iconv_t) -1) {
+ perror("iconv_open failed");
+ return g_strdup(utf8);
+ }
+
+ size_t in_left = strlen(utf8);
+ size_t out_left = 2 * in_left + 1;
+ char *buf = (char *)g_malloc(out_left);
+ char *in = utf8;
+ char *out = buf;
+
+ memset(buf, 0, out_left);
+ size_t err = iconv(idesc, &in, &in_left, &out, &out_left);
+ iconv_close(idesc);
+ return buf;
}

static void convertLE32to16(MPC_SAMPLE_FORMAT* sample_buffer, char* xmms_buffer, unsigned int status) {
kuniklo is offline   Reply With Quote