audacious-2.1の文字化けを直す

久々の更新です。

#最期の更新からすでに半年近くたってしまいました。。
#なかなか記事って書けないものですね (^^;;;

先日PCG-C1VJにVine LInux 5.1 を導入しました。
インターネットラジオとして活用すべくaudacious-2.1をインストールしてみると、Shift-JISなID3 Tagが見事に文字化けして ????-???(不正なUTF-8)などとでてしまいました。
調査したところ すでに audacious-2.2ではこの症状が直っているらしいです。。
ならば「2.2の修正を2.1に適用すれば直るんじゃね？」と思い、やってみました...

結果から言うと、文字化けに関係する部分の修正だけを2.2から拝借して2.1に適用したところ見事に文字化けが直りました
せっかくなので修正用のパッチを作成してみました

[1]audacious.spec.patch
--- audacious.spec.orig 2010-03-18 12:56:58.000000000 +0900 +++ audacious.spec 2010-03-18 12:57:22.000000000 +0900 @@ -5,7 +5,7 @@ Summary(ja): Audacious - 多くのフォーマットに対応した便利なメディアプレイヤー Name: audacious Version: 2.1 -Release: 2%{?_dist_release} +Release: 3%{?_dist_release} License: GPLv3 Group: Applications/Multimedia URL: <a href="http://audacious-media-player.org/" target="_blank">http://audacious-media-player.org/</a> @@ -13,6 +13,8 @@ Source1: audacious2.desktop #Source2: audacious-1.3.0-ja.po #Patch1: audacious-1.3.0-alpha3-use-xfont.patch +Patch: audacious-2.1-output.patch +Patch1: audacious-2.1-chardet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: glib2-devel @@ -68,6 +70,8 @@ %prep %setup -q -n %{name}-%{version}%{?extraver:-%extraver} +%patch -p1 +%patch1 -p1 # update ja.po #__cp -f %{SOURCE2} po/ja.po
[2]audacious-2.1-chardet.patch
diff -rNu audacious-2.1.orig/src/audacious/audconfig.c audacious-2.1/src/audacious/audconfig.c --- audacious-2.1.orig/src/audacious/audconfig.c 2009-07-07 07:39:12.000000000 +0900 +++ audacious-2.1/src/audacious/audconfig.c 2010-03-17 22:25:44.000000000 +0900 @@ -117,6 +117,7 @@ .show_separator_in_pl = TRUE, .chardet_detector = NULL, .chardet_fallback = NULL, + .chardet_fallback_s = NULL, .output_buffer_size = 500, .playlist_detect = TRUE, /* whether or not to postpone format detection on initial add */ .show_filepopup_for_tuple = TRUE, @@ -462,6 +463,14 @@ } } +void aud_config_chardet_update(void) +{ + if (cfg.chardet_fallback_s != NULL) + g_strfreev(cfg.chardet_fallback_s); + cfg.chardet_fallback_s = g_strsplit_set(cfg.chardet_fallback, " ,:;|/", 0); +} + + void aud_config_load(void) { @@ -550,6 +559,8 @@ if (!cfg.chardet_fallback) cfg.chardet_fallback = g_strdup(""); + aud_config_chardet_update(); + if (!cfg.cover_name_include) cfg.cover_name_include = g_strdup(""); diff -rNu audacious-2.1.orig/src/audacious/audconfig.h audacious-2.1/src/audacious/audconfig.h --- audacious-2.1.orig/src/audacious/audconfig.h 2009-07-07 07:39:12.000000000 +0900 +++ audacious-2.1/src/audacious/audconfig.h 2010-03-17 22:25:44.000000000 +0900 @@ -97,6 +97,7 @@ gboolean show_separator_in_pl; gchar *chardet_detector; gchar *chardet_fallback; + gchar **chardet_fallback_s; gint output_buffer_size; gboolean playlist_detect; gboolean show_filepopup_for_tuple; @@ -144,4 +145,6 @@ void aud_config_load(void); void aud_config_save(void); +void aud_config_chardet_update(void); + #endif /* AUDACIOUS_AUDCONFIG_H */ diff -rNu audacious-2.1.orig/src/audacious/auddrct.c audacious-2.1/src/audacious/auddrct.c --- audacious-2.1.orig/src/audacious/auddrct.c 2009-07-07 07:39:12.000000000 +0900 +++ audacious-2.1/src/audacious/auddrct.c 2010-03-17 22:53:58.000000000 +0900 @@ -23,6 +23,7 @@ #include "main.h" +#include "i18n.h" #include "input.h" #include "playback.h" #include "auddrct.h" diff -rNu audacious-2.1.orig/src/audacious/auddrct.c~ audacious-2.1/src/audacious/auddrct.c~ diff -rNu audacious-2.1.orig/src/audacious/chardet.c audacious-2.1/src/audacious/chardet.c --- audacious-2.1.orig/src/audacious/chardet.c 2009-07-07 07:39:12.000000000 +0900 +++ audacious-2.1/src/audacious/chardet.c 2010-03-17 22:31:25.000000000 +0900 @@ -18,6 +18,7 @@ */ #include "config.h" +#include "chardet.h" #include "audstrings.h" #include <glib/gi18n.h> #include "main.h" @@ -30,13 +31,11 @@ #endif gchar * -cd_str_to_utf8(const gchar *str) +cd_str_to_utf8(const gchar * str) { gchar *out_str; - /* NULL in NULL out */ - /* g_return_val_if_fail(str != NULL, NULL); */ - if (!str) + if (str == NULL) return NULL; /* Note: Currently, playlist calls this function repeatedly, even @@ -61,97 +60,100 @@ * utf-8. It is considered to be safe to use as a guard. */ + /* Already UTF-8? */ #ifdef USE_CHARDET - /* already UTF-8? */ if (dfa_validate_utf8(str, strlen(str))) return g_strdup(str); +#else + if (g_utf8_validate(str, strlen(str), NULL)) + return g_strdup(str); +#endif -# ifdef HAVE_UDET /* chardet encoding detector */ - if ((out_str = chardet_to_utf8(str, strlen(str), NULL, NULL, NULL))) + if ((out_str = cd_chardet_to_utf8(str, strlen(str), NULL, NULL, NULL)) != NULL) return out_str; -# endif -#endif /* assume encoding associated with locale */ - if ((out_str = g_locale_to_utf8(str, -1, NULL, NULL, NULL))) + if ((out_str = g_locale_to_utf8(str, -1, NULL, NULL, NULL)) != NULL) return out_str; - /* all else fails, we mask off character codes >= 128, - replace with '?' */ + /* all else fails, we mask off character codes >= 128, replace with '?' */ return str_to_utf8_fallback(str); } gchar * -cd_chardet_to_utf8(const gchar *str, gssize len, - gsize *arg_bytes_read, gsize *arg_bytes_write, - GError **arg_error) +cd_chardet_to_utf8(const gchar * str, gssize len, gsize * arg_bytes_read, + gsize * arg_bytes_write, GError ** error) { #ifdef USE_CHARDET - char *det = NULL, *encoding = NULL; + gchar *det = NULL, *encoding = NULL; #endif - gchar *ret = NULL; - gsize *bytes_read, *bytes_write; - GError **error; - gsize my_bytes_read, my_bytes_write; - - bytes_read = arg_bytes_read ? arg_bytes_read : &my_bytes_read; - bytes_write = arg_bytes_write ? arg_bytes_write : &my_bytes_write; - error = arg_error ? arg_error : NULL; + gchar *ret = NULL; + gsize *bytes_read, *bytes_write; + gsize my_bytes_read, my_bytes_write; - g_return_val_if_fail(str != NULL, NULL); + bytes_read = arg_bytes_read != NULL ? arg_bytes_read : &my_bytes_read; + bytes_write = arg_bytes_write != NULL ? arg_bytes_write : &my_bytes_write; -#ifdef USE_CHARDET - if(cfg.chardet_detector) - det = cfg.chardet_detector; + g_return_val_if_fail(str != NULL, NULL); - guess_init(); +#ifdef USE_CHARDET + if (cfg.chardet_detector) + det = cfg.chardet_detector; - if(det){ - encoding = (char *) guess_encoding(str, strlen(str), det); - if (!encoding) - goto fallback; + if (det) + { + encoding = (gchar *) guess_encoding(str, strlen(str), det); + if (encoding == NULL) + goto fallback; - ret = g_convert(str, len, "UTF-8", encoding, bytes_read, bytes_write, error); - } + ret = g_convert(str, len, "UTF-8", encoding, bytes_read, bytes_write, error); + } fallback: #endif - if(!ret && cfg.chardet_fallback){ - gchar **encs=NULL, **enc=NULL; - encs = g_strsplit_set(cfg.chardet_fallback, " ,:;|/", 0); - - if(encs){ - enc = encs; - for(enc=encs; *enc ; enc++){ - ret = g_convert(str, len, "UTF-8", *enc, bytes_read, bytes_write, error); - if(len == *bytes_read){ - break; - } - } - g_strfreev(encs); - } - } - - if(!ret){ - ret = g_convert(str, len, "UTF-8", "ISO-8859-1", bytes_read, bytes_write, error); - } - - if(ret){ - if(g_utf8_validate(ret, -1, NULL)) - return ret; - else { - g_free(ret); - ret = NULL; - } - } - - return NULL; /* if I have no idea, return NULL. */ + + /* If detection failed or was not enabled, try fallbacks (if there are any) */ + if (ret == NULL && cfg.chardet_fallback_s != NULL) + { + gchar **enc; + for (enc = cfg.chardet_fallback_s; *enc != NULL; enc++) + { + ret = g_convert(str, len, "UTF-8", *enc, bytes_read, bytes_write, error); + if (len == *bytes_read) + break; + else { + g_free(ret); + ret = NULL; + } + } + } + + /* The final fallback is ISO-8859-1, if no other is specified or conversions fail */ + if (ret == NULL) + ret = g_convert(str, len, "UTF-8", "ISO-8859-1", bytes_read, bytes_write, error); + + if (ret != NULL) + { + if (g_utf8_validate(ret, -1, NULL)) + return ret; + else + { + g_warning("g_utf8_validate() failed for converted string in cd_chardet_to_utf8: '%s'", ret); + g_free(ret); + return NULL; + } + } + + return NULL; /* If we have no idea, return NULL. */ } void chardet_init(void) { - str_to_utf8 = cd_str_to_utf8; - chardet_to_utf8 = cd_chardet_to_utf8; + str_to_utf8 = cd_str_to_utf8; + chardet_to_utf8 = cd_chardet_to_utf8; +#ifdef USE_CHARDET + guess_init(); +#endif } diff -rNu audacious-2.1.orig/src/audacious/playback.c audacious-2.1/src/audacious/playback.c --- audacious-2.1.orig/src/audacious/playback.c 2009-07-07 07:39:12.000000000 +0900 +++ audacious-2.1/src/audacious/playback.c 2010-03-17 23:00:35.000000000 +0900 @@ -410,6 +410,8 @@ playback->plugin = entry->decoder; playback->filename = g_strdup(entry->filename); + playback->title = g_strdup ((entry->title != NULL) ? entry->title : entry->filename); + // playback->length = playlist_entry_get_length (playlist, entry); playback->output = &psuedo_output_plugin; set_current_input_playback(playback);
[3]audacious-2.1-output.patch diff -Nur audacious-2.1-orig/src/audacious/output.c audacious-2.1/src/audacious/output.c --- audacious-2.1-orig/src/audacious/output.c 2009-07-07 00:39:12.000000000 +0200 +++ audacious-2.1/src/audacious/output.c 2009-11-21 20:40:48.000000000 +0100 @@ -489,145 +489,118 @@ return op->buffer_playing(); } -/* called by input plugin when data is ready */ -void -output_pass_audio(InputPlayback *playback, - AFormat fmt, /* output format */ - gint nch, /* channels */ - gint length, /* length of sample */ - gpointer ptr, /* data */ - int *going /* 0 when time to stop */ - ) -{ - static Flow *postproc_flow = NULL; - static Flow *legacy_flow = NULL; - OutputPlugin *op = playback->output; - gint writeoffs; - void * orig_ptr = ptr; - int orig_length = length; - void * old_ptr, * new_ptr; - int time = playback->output->written_time (); +static Flow * get_postproc_flow (void) +{ + static Flow * flow = NULL; - if (fmt != FMT_FLOAT) + if (flow == NULL) { - int samples = length / FMT_SIZEOF (fmt); + flow = flow_new (); - length = sizeof (float) * samples; - new_ptr = malloc (length); + #ifdef USE_SAMPLERATE + flow_link_element (flow, src_flow); + #endif - if (IS_S16_NE (fmt)) - s16_to_float (ptr, new_ptr, samples); - else - SAD_dither_process_buffer (sad_state_to_float, ptr, new_ptr, - samples / nch); - - if (ptr != orig_ptr) free (ptr); - ptr = new_ptr; + flow_link_element (flow, equalizer_flow); + flow_link_element (flow, volumecontrol_flow); } - vis_runner_pass_audio (time, ptr, length / sizeof (float), nch); + return flow; +} + +static Flow * get_legacy_flow (void) +{ + static Flow * flow = NULL; - if (bypass_dsp) + if (flow == NULL) { - if (ptr != orig_ptr) free (ptr); - ptr = orig_ptr; - length = orig_length; + flow = flow_new (); + flow_link_element (flow, effect_flow); } - else + + return flow; +} + +void output_pass_audio (InputPlayback * playback, AFormat fmt, gint channels, + gint size, void * data, gint * going) +{ + gint samples = size / FMT_SIZEOF (fmt); + void * allocated = NULL; + gint time = playback->output->written_time (); + + if (! bypass_dsp) { - if (! postproc_flow) + if (fmt != FMT_FLOAT) { - postproc_flow = flow_new (); -#ifdef USE_SAMPLERATE - flow_link_element (postproc_flow, src_flow); -#endif - flow_link_element (postproc_flow, equalizer_flow); - flow_link_element (postproc_flow, volumecontrol_flow); + gfloat * new = g_malloc (sizeof (gfloat) * samples); + + if (IS_S16_NE (fmt)) + s16_to_float (data, new, samples); + else + SAD_dither_process_buffer (sad_state_to_float, data, new, + samples / channels); + + data = new; + g_free (allocated); + allocated = new; } - old_ptr = ptr; - length = flow_execute (postproc_flow, time, & ptr, length, - FMT_FLOAT, decoder_srate, nch); - if (ptr != old_ptr && old_ptr != orig_ptr) free (old_ptr); + vis_runner_pass_audio (time, data, samples, channels); - if (op_state.fmt != FMT_FLOAT) + samples = flow_execute (get_postproc_flow (), time, & data, sizeof + (gfloat) * samples, FMT_FLOAT, decoder_srate, channels) / sizeof + (gfloat); + + if (data != allocated) { - int samples = length / sizeof (float); + g_free (allocated); + allocated = NULL; + } - length = FMT_SIZEOF (op_state.fmt) * samples; - new_ptr = malloc (length); + if (op_state.fmt != FMT_FLOAT) + { + void * new = g_malloc (FMT_SIZEOF (op_state.fmt) * samples); if (cfg.no_dithering && IS_S16_NE (op_state.fmt)) - float_to_s16 (ptr, new_ptr, samples); + float_to_s16 (data, new, samples); else - SAD_dither_process_buffer (sad_state_from_float, ptr, new_ptr, - samples / nch); + SAD_dither_process_buffer (sad_state_from_float, data, new, + samples / channels); - if (ptr != orig_ptr) free (ptr); - ptr = new_ptr; + data = new; + g_free (allocated); + allocated = new; } if (IS_S16_NE (op_state.fmt)) { - if (! legacy_flow) + samples = flow_execute (get_legacy_flow (), time, & data, 2 * + samples, op_state.fmt, op_state.rate, op_state.nch) / 2; + + if (data != allocated) { - legacy_flow = flow_new (); - flow_link_element (legacy_flow, effect_flow); + g_free (allocated); + allocated = NULL; } - - old_ptr = ptr; - length = flow_execute (legacy_flow, time, & ptr, length, - op_state.fmt, op_state.rate, op_state.nch); - if (ptr != old_ptr && old_ptr != orig_ptr) free (old_ptr); } } - /**** write it out ****/ - - writeoffs = 0; - while (writeoffs < length) + for (;;) { - int writable = length - writeoffs; - - if (writable > 2048) - writable = 2048; - - if (writable == 0) - return; - - while (op->buffer_free() < writable) /* wait output buf */ - { - GTimeVal pb_abs_time; - - g_get_current_time(&pb_abs_time); - g_time_val_add(&pb_abs_time, 10000); - - if (going && !*going) /* thread stopped? */ - return; /* so finish */ - - if (ip_data.stop) /* has a stop been requested? */ - return; /* yes, so finish */ - - /* else sleep for retry */ - g_mutex_lock(playback->pb_change_mutex); - g_cond_timed_wait(playback->pb_change_cond, playback->pb_change_mutex, &pb_abs_time); - g_mutex_unlock(playback->pb_change_mutex); - } - - if (ip_data.stop) - return; + gint ready = playback->output->buffer_free () / FMT_SIZEOF (op_state.fmt); - if (going && !*going) /* thread stopped? */ - return; /* so finish */ + ready = MIN (ready, samples); + playback->output->write_audio (data, FMT_SIZEOF (op_state.fmt) * ready); + data = (char *) data + FMT_SIZEOF (op_state.fmt) * ready; + samples -= ready; - /* do output */ - plugin_set_current((Plugin *)op); - op->write_audio(((guint8 *) ptr) + writeoffs, writable); + if (! samples) + break; - writeoffs += writable; + g_usleep (50000); } - if (ptr != orig_ptr) free (ptr); + g_free (allocated); } /* called by input plugin when RG info available --asphyx */ diff -Nur audacious-2.1-orig/src/audacious/output.h audacious-2.1/src/audacious/output.h --- audacious-2.1-orig/src/audacious/output.h 2009-07-07 00:39:12.000000000 +0200 +++ audacious-2.1/src/audacious/output.h 2009-11-09 15:28:15.000000000 +0100 @@ -62,7 +62,8 @@ gint output_buffer_free(void); gint output_buffer_playing(void); -void output_pass_audio(InputPlayback *, AFormat, gint, gint, gpointer, int *); +void output_pass_audio (InputPlayback * playback, AFormat format, gint channels, + gint size, void * data, gint * going); void output_set_replaygain_info(InputPlayback *, ReplayGainInfo *); gint get_written_time(void);
なお、下記手順はrootで /root/rpm/以下がある前提です
もし環境が違う場合は適宜読み替えてください
また/root/rpm/RPMS/i386/以下にはなにもおかない状態にしてください

[手順]
(1)cd /root/rpm/SOURCES
(2)上記3つのパッチを 指定のファイル名で/root/rpm/SOURCESに置く
特にaudacious.spec.patchはUTF-8形式で保存してください
(3)apt-get build-dep audacious
(4)apt-get source audacious
(5)apt-get -d install audacious-plugins
(6)apt-get -d install self-build-audacious-mad
(7)cp /var/cache/apt/archives/self-build-audacious-mad-xxx-xxx.rpm /root/RPMS/i386/.
(8)cp /var/cache/apt/archives/audacious-plugins-xxx-xxx.rpm /root/RPMS/i386/.
(9)cd /root/rpm/SPECS
(10)patch -p0 < ../SOURCES/audacious.spec.patch
(11)rpmbuild -bb audacious.spec
(12)Compileが完了してrpmファイルができるまで待ちます
(13)cd /root/rpm/RPMS/i386
(14)rpm -Uvh *.rpm

以上で文字化け問題が解消されたaudacious-2.1.3がインストールされます
self-build-audacious-madも導入しているのでmp3も聞けます

あっそうそう、audaciousの設定は以下のようにしてください
[設定]->[プレイリスト]->[自動キャラクタエンコーディング検出]->日本語
[設定]->[プレイリスト]->[代替えキャラクタエンコーディング]->Shift_JIS
[設定]->[Skinned Interface]->[Use Bitmap fonts if available]のチェックをはずす

---

本手法はあくまでも一実施例です
環境によっては本手法がそのまま使えないかもしれません。
またVineがaudacious-2.2をリリースすればこのパッチは不要となるでしょう
Vineの正式リリースを待てない方はお試しください

いかがだったでしょうか

コメント 2

Vine5.1 64bitのユーザーです．
ちまちまとUTF-8に変換していたのですが，ストリーミングラジオは文字化けのままでした．お陰様で見事に解消しました!
パスは，/usr/src/vine/RPMS/x86_64でいけました．
ありがとうございました．
by あるとん (2010-05-04 21:54) 

ぽちぽちブログをはじめてますが、はじめてまともにコメントを戴いて感謝感謝です
でも、Vineも audacious-2.3になったのですでにごみ記事になってしまいましたね (^^;;

by にょん (2010-05-31 22:17)