# HG changeset patch
# User yaz
# Date 1173509258 28800
# Node ID d200de50a1fca9b7fa4c35373074583cdcb524e8
# Parent  a1d56f2c8bb112cb4a43fdd5ffcfae143022a528
[svn] - convert filename into utf8 in debug messages.

diff -r a1d56f2c8bb1 -r d200de50a1fc ChangeLog
--- a/ChangeLog	Fri Mar 09 12:42:48 2007 -0800
+++ b/ChangeLog	Fri Mar 09 22:47:38 2007 -0800
@@ -1,3 +1,10 @@
+2007-03-09 20:42:48 +0000  Giacomo Lozito <james@develia.org>
+  revision [1694]
+  - amidi-plug: change version number to reflect the code differences between audacious version and stand-alone version
+  trunk/src/amidi-plug/i_common.h |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-03-08 17:24:04 +0000  Giacomo Lozito <james@develia.org>
   revision [1692]
   - madplug: do not call set_info repeatedly in input_process_remote_metadata, only call it when the built title string actually differs from the previous one
diff -r a1d56f2c8bb1 -r d200de50a1fc src/madplug/fileinfo.c
--- a/src/madplug/fileinfo.c	Fri Mar 09 12:42:48 2007 -0800
+++ b/src/madplug/fileinfo.c	Fri Mar 09 22:47:38 2007 -0800
@@ -570,7 +570,11 @@
     char *utf_filename;
 
 #ifdef DEBUG
-    g_message("f: audmad_get_file_info: %s", filename);
+    {
+        gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+        g_message("f: audmad_get_file_info: %s", tmp);
+        g_free(tmp);
+    }
 #endif
     input_init(&info, filename);
 
diff -r a1d56f2c8bb1 -r d200de50a1fc src/madplug/input.c
--- a/src/madplug/input.c	Fri Mar 09 12:42:48 2007 -0800
+++ b/src/madplug/input.c	Fri Mar 09 22:47:38 2007 -0800
@@ -510,7 +510,9 @@
 gboolean input_get_info(struct mad_info_t *info, gboolean fast_scan)
 {
 #ifdef DEBUG
-    g_message("f: input_get_info: %s, fast_scan = %s", info->filename, fast_scan ? "TRUE" : "FALSE");
+    gchar *tmp = g_filename_to_utf8(info->filename, -1, NULL, NULL, NULL);    
+    g_message("f: input_get_info: %s, fast_scan = %s", tmp, fast_scan ? "TRUE" : "FALSE");
+    g_free(tmp);
 #endif                          /* DEBUG */
 
     input_alloc_tag(info);
diff -r a1d56f2c8bb1 -r d200de50a1fc src/madplug/plugin.c
--- a/src/madplug/plugin.c	Fri Mar 09 12:42:48 2007 -0800
+++ b/src/madplug/plugin.c	Fri Mar 09 22:47:38 2007 -0800
@@ -244,7 +244,9 @@
     }
 
     if(vfs_fread(buf, 1, 4, fin) == 0) {
-        g_message("vfs_fread failed @1 %s", g_filename_to_utf8(filename, -1, NULL, NULL, NULL));
+        gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+        g_message("vfs_fread failed @1 %s", tmp);
+        g_free(tmp);
     }
 
     check = mp3_head_convert(buf);
@@ -257,7 +259,9 @@
     {
         vfs_fseek(fin, 4, SEEK_CUR);
         if(vfs_fread(buf, 1, 4, fin) == 0) {
-            g_message("vfs_fread failed @2 %s", g_filename_to_utf8(filename, -1, NULL, NULL, NULL));
+            gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);            
+            g_message("vfs_fread failed @2 %s", tmp);
+            g_free(tmp);
         }
 
         if (memcmp(buf, "RMP3", 4) == 0)
@@ -267,7 +271,9 @@
     while (!mp3_head_check(check))
     {
         if((ret = vfs_fread(tmp, 1, 4096, fin)) == 0){
-            g_message("vfs_fread failed @3 %s", g_filename_to_utf8(filename, -1, NULL, NULL, NULL));
+            gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+            g_message("vfs_fread failed @3 %s", tmp);
+            g_free(tmp);
         }
         for (i = 0; i < ret; i++)
         {
@@ -340,7 +346,11 @@
     gchar *url = playback->filename;
 
 #ifdef DEBUG
-    g_message("playing %s", url);
+    {
+        gchar *tmp = g_filename_to_utf8(url, -1, NULL, NULL, NULL);
+        g_message("playing %s", tmp);
+        g_free(tmp);
+    }
 #endif                          /* DEBUG */
 
     if (input_init(&info, url) == FALSE) {
@@ -389,7 +399,9 @@
 {
     struct mad_info_t myinfo;
 #ifdef DEBUG
-    g_message("f: audmad_get_song_info: %s", url);
+    gchar *tmp = g_filename_to_utf8(url, -1, NULL, NULL, NULL);
+    g_message("f: audmad_get_song_info: %s", tmp);
+    g_free(tmp);
 #endif                          /* DEBUG */
 
     if (input_init(&myinfo, url) == FALSE) {
diff -r a1d56f2c8bb1 -r d200de50a1fc src/madplug/replaygain.c
--- a/src/madplug/replaygain.c	Fri Mar 09 12:42:48 2007 -0800
+++ b/src/madplug/replaygain.c	Fri Mar 09 22:47:38 2007 -0800
@@ -254,9 +254,11 @@
     }
 #ifdef DEBUG
     if (res == 0) {             // got APE tags, show the result
+        gchar *tmp = g_filename_to_utf8(file_info->filename, -1, NULL, NULL, NULL);        
         g_message("RG album scale= %g, RG track scale = %g, in %s",
 		  file_info->replaygain_album_scale,
-		  file_info->replaygain_track_scale, file_info->filename);
+		  file_info->replaygain_track_scale, tmp);
+        g_free(tmp);
     }
 #endif