Mercurial > audlegacy-plugins
comparison src/madplug/input.c @ 687:6dd733e046fa trunk
[svn] Revert r1456, this gives problems with some files with broken ID3-Tags.
| author | js |
|---|---|
| date | Tue, 20 Feb 2007 06:11:10 -0800 |
| parents | 46743e3ebcc1 |
| children | c787612e29ff |
comparison
equal
deleted
inserted
replaced
| 686:0d098b87207a | 687:6dd733e046fa |
|---|---|
| 309 return NULL; | 309 return NULL; |
| 310 | 310 |
| 311 switch (encoding) { | 311 switch (encoding) { |
| 312 case ID3_FIELD_TEXTENCODING_ISO_8859_1: | 312 case ID3_FIELD_TEXTENCODING_ISO_8859_1: |
| 313 rtn0 = (gchar *)id3_ucs4_latin1duplicate(string); | 313 rtn0 = (gchar *)id3_ucs4_latin1duplicate(string); |
| 314 rtn = g_convert(rtn0, -1, "utf8", "iso8859-1", NULL, NULL, NULL); | 314 rtn = str_to_utf8(rtn0); |
| 315 g_free(rtn0); | 315 g_free(rtn0); |
| 316 break; | 316 break; |
| 317 case ID3_FIELD_TEXTENCODING_UTF_8: | 317 case ID3_FIELD_TEXTENCODING_UTF_8: |
| 318 default: | 318 default: |
| 319 rtn = (gchar *)id3_ucs4_utf8duplicate(string); | 319 rtn = (gchar *)id3_ucs4_utf8duplicate(string); |