Mercurial > audlegacy-plugins

diff src/madplug/input.c @ 2050:2ffc6a69fcd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
string API calls -> vtable
author William Pitcock <nenolod@atheme.org>
date Sat, 13 Oct 2007 19:55:04 -0500
parents a260bd1beef0
children 2f2ffbc2d04d
line wrap: on
line diff
--- a/src/madplug/input.c	Sun Oct 14 01:33:02 2007 +0300
+++ b/src/madplug/input.c	Sat Oct 13 19:55:04 2007 -0500
@@ -306,7 +306,7 @@
     switch (encoding) {
     case ID3_FIELD_TEXTENCODING_ISO_8859_1:
         rtn0 = (gchar *)id3_ucs4_latin1duplicate(string);
-        rtn = str_to_utf8(rtn0);
+        rtn = aud_str_to_utf8(rtn0);
         g_free(rtn0);
         break;
     case ID3_FIELD_TEXTENCODING_UTF_8:
@@ -460,7 +460,7 @@
             metadata = TRUE;
             gchar *scratch;
 
-            scratch = str_to_utf8(tmp);
+            scratch = aud_str_to_utf8(tmp);
             aud_tuple_associate_string(info->tuple, FIELD_TITLE, NULL, scratch);
             g_free(scratch);
 
@@ -473,7 +473,7 @@
             metadata = TRUE;
             gchar *scratch;
 
-            scratch = str_to_utf8(tmp);
+            scratch = aud_str_to_utf8(tmp);
             aud_tuple_associate_string(info->tuple, FIELD_ALBUM, NULL, scratch);
             aud_tuple_associate_string(info->tuple, -1, "stream", scratch);
             g_free(scratch);
@@ -487,7 +487,7 @@
         else {
             gchar *realfn = g_filename_from_uri(info->filename, NULL, NULL);
             gchar *tmp2 = g_path_get_basename(realfn ? realfn : info->filename); // info->filename is uri. --yaz
-            tmp = str_to_utf8(tmp2);
+            tmp = aud_str_to_utf8(tmp2);
             g_free(tmp2); tmp2 = NULL;
             g_free(realfn); realfn = NULL;
 //            tmp = g_strdup(g_basename(info->filename)); //XXX maybe ok. --yaz