changeset 250:1bded2e3d57b trunk

[svn] - fix taglib stupidity. closes #633
author nenolod
date Wed, 15 Nov 2006 12:04:06 -0800
parents 9b6d7ffb926f
children 0469aa4ae1ec
files ChangeLog src/mpg123/fileinfo.c src/mpg123/mpg123.c
diffstat 3 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Nov 15 11:59:28 2006 -0800
+++ b/ChangeLog	Wed Nov 15 12:04:06 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-15 19:59:28 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [516]
+  - don't save tags in unicode if chardet is enabled. bug and patch by zhllg, closes #632
+  
+  trunk/src/mpg123/fileinfo.c |    4 ++++
+  1 file changed, 4 insertions(+)
+
+
 2006-11-14 21:24:37 +0000  Kiyoshi Aman <kiyoshi.aman@gmail.com>
   revision [514]
   Another cloudscape. I was bored.
--- a/src/mpg123/fileinfo.c	Wed Nov 15 11:59:28 2006 -0800
+++ b/src/mpg123/fileinfo.c	Wed Nov 15 12:04:06 2006 -0800
@@ -125,7 +125,7 @@
   if (str_has_prefix_nocase(current_filename, "file://"))
     current_filename += 7;
 
-  taglib_file = taglib_file_new(current_filename);
+  taglib_file = taglib_file_new_type(current_filename, TagLib_File_MPEG);
   if(taglib_file) {
     taglib_tag = taglib_file_tag(taglib_file);
     taglib_ap = taglib_file_audioproperties(taglib_file);
@@ -170,7 +170,7 @@
   if (str_has_prefix_nocase(current_filename, "http://"))
     return;
   
-  taglib_file = taglib_file_new(current_filename);
+  taglib_file = taglib_file_new_type(current_filename, TagLib_File_MPEG);
   if(taglib_file) {
     taglib_tag = taglib_file_tag(taglib_file);
     taglib_ap = taglib_file_audioproperties(taglib_file);
@@ -700,7 +700,7 @@
 #ifdef USE_CHARDET
   taglib_set_strings_unicode(FALSE);
 #endif
-  taglib_file = taglib_file_new(current_filename);
+  taglib_file = taglib_file_new_type(current_filename, TagLib_File_MPEG);
   if(taglib_file) {
     taglib_tag = taglib_file_tag(taglib_file);
     taglib_ap = taglib_file_audioproperties(taglib_file);
--- a/src/mpg123/mpg123.c	Wed Nov 15 11:59:28 2006 -0800
+++ b/src/mpg123/mpg123.c	Wed Nov 15 12:04:06 2006 -0800
@@ -549,7 +549,7 @@
     {
         tuple = bmp_title_input_new();
 
-        taglib_file = taglib_file_new(filename);
+        taglib_file = taglib_file_new_type(filename, TagLib_File_MPEG);
         taglib_tag = NULL;
 
         if (taglib_file != NULL)