changeset 898:06ecbb1e3dbb trunk

[svn] - non-utf string had been used for file name in window title of File Info window. patch by M.H. - tweak debug printout.
author yaz
date Sat, 24 Mar 2007 23:15:05 -0700
parents 44a922a4a591
children 68508f8cdf25
files ChangeLog src/madplug/fileinfo.c
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Mar 24 17:31:14 2007 -0700
+++ b/ChangeLog	Sat Mar 24 23:15:05 2007 -0700
@@ -1,3 +1,11 @@
+2007-03-25 00:31:14 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1894]
+  - fix validation of mpeg2 files, by ccr.
+  
+  trunk/src/madplug/plugin.c |   14 ++++++++++----
+  1 file changed, 10 insertions(+), 4 deletions(-)
+
+
 2007-03-24 16:44:44 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1892]
   - small cleanups.
--- a/src/madplug/fileinfo.c	Sat Mar 24 17:31:14 2007 -0700
+++ b/src/madplug/fileinfo.c	Sat Mar 24 23:15:05 2007 -0700
@@ -571,7 +571,7 @@
 
 #ifdef DEBUG
     {
-        gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+        gchar *tmp = str_to_utf8(filename);
         g_message("f: audmad_get_file_info: %s", tmp);
         g_free(tmp);
     }
@@ -588,7 +588,7 @@
 
     input_get_info(&info, info.remote ? TRUE : audmad_config.fast_play_time_calc);
 
-    title = g_strdup_printf("File Info - %s", g_basename(filename));
+    title = g_strdup_printf("File Info - %s", g_basename(utf_filename));
     gtk_window_set_title(GTK_WINDOW(window), title);
     g_free(title);
 
@@ -706,7 +706,7 @@
             string = id3_field_getstrings(field, 0);
             genre = mad_parse_genre(string);
 #ifdef DEBUG
-            {
+            if (genre) {
                 gchar *utf = (gchar *)id3_ucs4_utf8duplicate(genre);
                 g_print("genre = %s\n", utf);
                 g_print("genre num = %d\n", id3_genre_number(genre));