comparison src/mpg123/fileinfo.c @ 249:9b6d7ffb926f trunk

[svn] - don't save tags in unicode if chardet is enabled. bug and patch by zhllg, closes #632
author nenolod
date Wed, 15 Nov 2006 11:59:28 -0800
parents a793fb91ecde
children 1bded2e3d57b
comparison
equal deleted inserted replaced
248:899a5c610a03 249:9b6d7ffb926f
115 int result; 115 int result;
116 116
117 if (str_has_prefix_nocase(current_filename, "http://")) 117 if (str_has_prefix_nocase(current_filename, "http://"))
118 return; 118 return;
119 119
120 #ifndef USE_CHARDET
120 taglib_set_strings_unicode(1); 121 taglib_set_strings_unicode(1);
122 #endif
121 123
122 /* XXX: Gnome VFS workaround. -nenolod */ 124 /* XXX: Gnome VFS workaround. -nenolod */
123 if (str_has_prefix_nocase(current_filename, "file://")) 125 if (str_has_prefix_nocase(current_filename, "file://"))
124 current_filename += 7; 126 current_filename += 7;
125 127
127 if(taglib_file) { 129 if(taglib_file) {
128 taglib_tag = taglib_file_tag(taglib_file); 130 taglib_tag = taglib_file_tag(taglib_file);
129 taglib_ap = taglib_file_audioproperties(taglib_file); 131 taglib_ap = taglib_file_audioproperties(taglib_file);
130 } else return; 132 } else return;
131 133
134 #ifndef USE_CHARDET
132 taglib_set_id3v2_default_text_encoding(); 135 taglib_set_id3v2_default_text_encoding();
136 #endif
133 taglib_tag_set_title(taglib_tag, gtk_entry_get_text(GTK_ENTRY(title_entry))); 137 taglib_tag_set_title(taglib_tag, gtk_entry_get_text(GTK_ENTRY(title_entry)));
134 taglib_tag_set_artist(taglib_tag, gtk_entry_get_text(GTK_ENTRY(artist_entry))); 138 taglib_tag_set_artist(taglib_tag, gtk_entry_get_text(GTK_ENTRY(artist_entry)));
135 taglib_tag_set_album(taglib_tag, gtk_entry_get_text(GTK_ENTRY(album_entry))); 139 taglib_tag_set_album(taglib_tag, gtk_entry_get_text(GTK_ENTRY(album_entry)));
136 taglib_tag_set_comment(taglib_tag, gtk_entry_get_text(GTK_ENTRY(comment_entry))); 140 taglib_tag_set_comment(taglib_tag, gtk_entry_get_text(GTK_ENTRY(comment_entry)));
137 taglib_tag_set_year(taglib_tag, atoi(gtk_entry_get_text(GTK_ENTRY(year_entry)))); 141 taglib_tag_set_year(taglib_tag, atoi(gtk_entry_get_text(GTK_ENTRY(year_entry))));