# HG changeset patch
# User nenolod
# Date 1163620768 28800
# Node ID 9b6d7ffb926fb9724fc9afffd9b0e64cd5d916aa
# Parent  899a5c610a03a768b02f7a657d0a1bd23c94a24a
[svn] - don't save tags in unicode if chardet is enabled. bug and patch by zhllg, closes #632

diff -r 899a5c610a03 -r 9b6d7ffb926f ChangeLog
--- a/ChangeLog	Tue Nov 14 13:24:37 2006 -0800
+++ b/ChangeLog	Wed Nov 15 11:59:28 2006 -0800
@@ -1,3 +1,12 @@
+2006-11-14 21:24:37 +0000  Kiyoshi Aman <kiyoshi.aman@gmail.com>
+  revision [514]
+  Another cloudscape. I was bored.
+  
+  trunk/src/paranormal/presets/Makefile                 |    1 
+  trunk/src/paranormal/presets/aerdan_-_cloudscape2.pnv |   38 ++++++++++++++++++
+  2 files changed, 39 insertions(+)
+
+
 2006-11-14 21:00:10 +0000  William Pitcock <nenolod@nenolod.net>
   revision [512]
   - remove convertUTF8toLocale, we obviously don't need it.
diff -r 899a5c610a03 -r 9b6d7ffb926f src/mpg123/fileinfo.c
--- a/src/mpg123/fileinfo.c	Tue Nov 14 13:24:37 2006 -0800
+++ b/src/mpg123/fileinfo.c	Wed Nov 15 11:59:28 2006 -0800
@@ -117,7 +117,9 @@
   if (str_has_prefix_nocase(current_filename, "http://"))
     return;
 
+#ifndef USE_CHARDET
   taglib_set_strings_unicode(1);
+#endif
 
   /* XXX: Gnome VFS workaround. -nenolod */
   if (str_has_prefix_nocase(current_filename, "file://"))
@@ -129,7 +131,9 @@
     taglib_ap = taglib_file_audioproperties(taglib_file);
   } else return;
 
+#ifndef USE_CHARDET
   taglib_set_id3v2_default_text_encoding();
+#endif
   taglib_tag_set_title(taglib_tag, gtk_entry_get_text(GTK_ENTRY(title_entry)));
   taglib_tag_set_artist(taglib_tag, gtk_entry_get_text(GTK_ENTRY(artist_entry)));
   taglib_tag_set_album(taglib_tag, gtk_entry_get_text(GTK_ENTRY(album_entry)));