diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2003-09-15 17:09:46 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2003-09-15 17:09:46 +0000 |
| commit | 10edcc893ef593a1a3fa4d3160661718b4cbac30 (patch) | |
| tree | 88e2efabe3e89d0fe3863c59a3e16cadb0aec6a5 /media-sound/xmms/files | |
| parent | cleanup (diff) | |
| download | historical-10edcc893ef593a1a3fa4d3160661718b4cbac30.tar.gz historical-10edcc893ef593a1a3fa4d3160661718b4cbac30.tar.bz2 historical-10edcc893ef593a1a3fa4d3160661718b4cbac30.zip | |
cjk patch patched
Diffstat (limited to 'media-sound/xmms/files')
| -rw-r--r-- | media-sound/xmms/files/xmms-1.2.8-mpg123j.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media-sound/xmms/files/xmms-1.2.8-mpg123j.patch b/media-sound/xmms/files/xmms-1.2.8-mpg123j.patch index 097ba4d36cd3..a91ff339319c 100644 --- a/media-sound/xmms/files/xmms-1.2.8-mpg123j.patch +++ b/media-sound/xmms/files/xmms-1.2.8-mpg123j.patch @@ -248,13 +248,15 @@ diff -urN xmms-1.2.8/Input/mpg123/id3_frame_text.c xmms-1.2.8-jp/Input/mpg123/id { char *text16 = (char *) frame->fr_data + 1; -@@ -161,11 +169,16 @@ +@@ -161,11 +169,15 @@ return NULL; } } - - if (*(guint8 *) frame->fr_data == ID3_ENCODING_ISO_8859_1) - return g_strdup((char *) frame->fr_data + 1); +- else +- return id3_utf16_to_ascii(((char *) frame->fr_data + 1)); + switch (*(guint8 *) frame->fr_data) { + case ID3_ENCODING_ISO_8859_1: + case ID3_ENCODING_UTF8: @@ -262,8 +264,6 @@ diff -urN xmms-1.2.8/Input/mpg123/id3_frame_text.c xmms-1.2.8-jp/Input/mpg123/id + case ID3_ENCODING_UTF16: + case ID3_ENCODING_UTF16BE: + default: - else -- return id3_utf16_to_ascii(((char *) frame->fr_data + 1)); + return id3_utf16_to_ascii(((char *) frame->fr_data + 1)); + } } |