# HG changeset patch # User William Pitcock # Date 1192326187 18000 # Node ID 2f2ffbc2d04d2955e4859ee133addb9b297686a9 # Parent f7deb2ae6f0af09dc4dd23a63c2a306f50586c59 gentitle changes diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/aac/libmp4.c --- a/src/aac/libmp4.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/aac/libmp4.c Sat Oct 13 20:43:07 2007 -0500 @@ -455,7 +455,7 @@ gchar *title; Tuple *tuple = mp4_get_song_tuple(filename); - title = aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); aud_tuple_free(tuple); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/adplug/adplug-xmms.cc --- a/src/adplug/adplug-xmms.cc Sat Oct 13 20:38:34 2007 -0500 +++ b/src/adplug/adplug-xmms.cc Sat Oct 13 20:43:07 2007 -0500 @@ -708,7 +708,7 @@ static char* format_and_free_ti( Tuple* ti, int* length ) { - char* result = aud_tuple_formatter_make_title_string(ti, get_gentitle_format()); + char* result = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format()); if ( result ) *length = aud_tuple_get_int(ti, FIELD_LENGTH, NULL); aud_tuple_free((void *) ti); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/alac/plugin.c --- a/src/alac/plugin.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/alac/plugin.c Sat Oct 13 20:43:07 2007 -0500 @@ -338,7 +338,7 @@ /* Get the titlestring ready. */ ti = build_aud_tuple_from_demux(&demux_res, (char *) args); - title = aud_tuple_formatter_make_title_string(ti, get_gentitle_format()); + title = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format()); /* initialise the sound converter */ demux_res.alac = create_alac(demux_res.sample_size, demux_res.num_channels); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/cdaudio-ng/cdaudio-ng.c --- a/src/cdaudio-ng/cdaudio-ng.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/cdaudio-ng/cdaudio-ng.c Sat Oct 13 20:43:07 2007 -0500 @@ -533,7 +533,7 @@ is_paused = FALSE; tuple = create_tuple_from_trackinfo(pinputplayback->filename); - title = aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); pinputplayback->set_params(pinputplayback, title, calculate_track_length(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn), 1411200, 44100, 2); g_free(title); @@ -774,7 +774,7 @@ Tuple *tuple = create_tuple_from_trackinfo(filename); if (tuple) { - *title = aud_tuple_formatter_process_string(tuple, get_gentitle_format()); + *title = aud_tuple_formatter_process_string(tuple, aud_get_gentitle_format()); aud_tuple_free(tuple); tuple = NULL; } diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/console/Audacious_Driver.cxx --- a/src/console/Audacious_Driver.cxx Sat Oct 13 20:38:34 2007 -0500 +++ b/src/console/Audacious_Driver.cxx Sat Oct 13 20:43:07 2007 -0500 @@ -237,7 +237,7 @@ static char* format_and_free_ti( Tuple* ti, int* length ) { - char* result = aud_tuple_formatter_make_title_string(ti, get_gentitle_format()); + char* result = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format()); if ( result ) *length = aud_tuple_get_int(ti, FIELD_LENGTH, NULL); aud_tuple_free((void *) ti); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/filewriter/filewriter.c --- a/src/filewriter/filewriter.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/filewriter/filewriter.c Sat Oct 13 20:43:07 2007 -0500 @@ -203,7 +203,7 @@ if (filenamefromtags) { - gchar *utf8 = aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + gchar *utf8 = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); g_strchomp(utf8); //chop trailing ^J --yaz diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/flacng/tools.c --- a/src/flacng/tools.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/flacng/tools.c Sat Oct 13 20:43:07 2007 -0500 @@ -284,7 +284,7 @@ input = get_tuple(filename, info); - title = aud_tuple_formatter_make_title_string(input, get_gentitle_format()); + title = aud_tuple_formatter_make_title_string(input, aud_get_gentitle_format()); aud_tuple_free(input); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/madplug/decoder.c --- a/src/madplug/decoder.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/madplug/decoder.c Sat Oct 13 20:43:07 2007 -0500 @@ -483,7 +483,7 @@ if (info->title) g_free(info->title); info->title = aud_tuple_formatter_make_title_string(info->tuple, audmad_config.title_override == TRUE ? - audmad_config.id3_format : get_gentitle_format()); + audmad_config.id3_format : aud_get_gentitle_format()); tlen = (gint) mad_timer_count(info->duration, MAD_UNITS_MILLISECONDS), info->playback->set_params(info->playback, info->title, diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/madplug/input.c --- a/src/madplug/input.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/madplug/input.c Sat Oct 13 20:43:07 2007 -0500 @@ -425,7 +425,7 @@ aud_tuple_associate_string(tuple, FIELD_QUALITY, NULL, "lossy"); info->title = aud_tuple_formatter_make_title_string(tuple, audmad_config.title_override == TRUE ? - audmad_config.id3_format : get_gentitle_format()); + audmad_config.id3_format : aud_get_gentitle_format()); // for connection via proxy, we have to stop transfer once. I can't explain the reason. if (info->infile != NULL) { diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/modplug/modplugbmp.cxx --- a/src/modplug/modplugbmp.cxx Sat Oct 13 20:38:34 2007 -0500 +++ b/src/modplug/modplugbmp.cxx Sat Oct 13 20:43:07 2007 -0500 @@ -21,7 +21,7 @@ static char* format_and_free_ti( Tuple* ti, int* length ) { - char* result = aud_tuple_formatter_make_title_string(ti, get_gentitle_format()); + char* result = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format()); if ( result ) *length = aud_tuple_get_int(ti, FIELD_LENGTH, NULL); aud_tuple_free((void *) ti); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/musepack/libmpc.cxx --- a/src/musepack/libmpc.cxx Sat Oct 13 20:38:34 2007 -0500 +++ b/src/musepack/libmpc.cxx Sat Oct 13 20:43:07 2007 -0500 @@ -743,7 +743,7 @@ { Tuple* tuple = mpcGetSongTuple(p_Filename); - char* title = aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + char* title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); aud_tuple_free((void *) tuple); return title; diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/sexypsf/plugin.c --- a/src/sexypsf/plugin.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/sexypsf/plugin.c Sat Oct 13 20:43:07 2007 -0500 @@ -246,7 +246,7 @@ Tuple *tuple = get_aud_tuple_psf(fn); if (tuple != NULL) { - title = aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); aud_tuple_free(tuple); } else diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/sid/xmms-sid.c --- a/src/sid/xmms-sid.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/sid/xmms-sid.c Sat Oct 13 20:43:07 2007 -0500 @@ -399,7 +399,7 @@ xs_get_song_tuple_info(tmpTuple, tmpTune, xs_status.currSong); tmpTitle = aud_tuple_formatter_process_string(tmpTuple, - xs_cfg.titleOverride ? xs_cfg.titleFormat : get_gentitle_format()); + xs_cfg.titleOverride ? xs_cfg.titleFormat : aud_get_gentitle_format()); XSDEBUG("foobar #4\n"); XS_MUTEX_LOCK(xs_status); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/timidity/xmms-timidity.c --- a/src/timidity/xmms-timidity.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/timidity/xmms-timidity.c Sat Oct 13 20:43:07 2007 -0500 @@ -291,7 +291,7 @@ input = aud_tuple_new_from_filename(filename); - title = aud_tuple_formatter_make_title_string(input, get_gentitle_format()); + title = aud_tuple_formatter_make_title_string(input, aud_get_gentitle_format()); if (title == NULL || *title == '\0') title = g_strdup(aud_tuple_get_string(input, FIELD_FILE_NAME, NULL)); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/tta/libtta.c --- a/src/tta/libtta.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/tta/libtta.c Sat Oct 13 20:43:07 2007 -0500 @@ -157,7 +157,7 @@ static gchar * get_song_title(Tuple *tuple) { - return aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + return aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); } static void diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/vorbis/vorbis.c --- a/src/vorbis/vorbis.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/vorbis/vorbis.c Sat Oct 13 20:43:07 2007 -0500 @@ -592,7 +592,7 @@ *length = aud_tuple_get_int(tuple, FIELD_LENGTH, NULL); *title = aud_tuple_formatter_make_title_string(tuple, vorbis_cfg.tag_override ? - vorbis_cfg.tag_format : get_gentitle_format()); + vorbis_cfg.tag_format : aud_get_gentitle_format()); aud_tuple_free(tuple); } @@ -813,7 +813,7 @@ input = get_aud_tuple_for_vorbisfile(vorbisfile, filename, vorbis_is_streaming); displaytitle = aud_tuple_formatter_make_title_string(input, vorbis_cfg.tag_override ? - vorbis_cfg.tag_format : get_gentitle_format()); + vorbis_cfg.tag_format : aud_get_gentitle_format()); if ((tmp = aud_vfs_get_metadata(((VFSVorbisFile *) vorbisfile->datasource)->fd, "stream-name")) != NULL) { diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/vtx/vtx.c --- a/src/vtx/vtx.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/vtx/vtx.c Sat Oct 13 20:43:07 2007 -0500 @@ -234,7 +234,7 @@ seek_to = -1; ti = vtx_get_song_tuple_from_vtx(playback->filename, &vtx); - buf = aud_tuple_formatter_make_title_string(ti, get_gentitle_format()); + buf = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format()); playback->set_params (playback, buf, vtx.hdr.regdata_size / 14 * 1000 / 50, 14 * 50 * 8, freq, bits / 8); @@ -298,7 +298,7 @@ if (ayemu_vtx_open (&tmp, filename)) { Tuple *ti = vtx_get_song_tuple_from_vtx(filename, &tmp); - *title = aud_tuple_formatter_process_string(ti, get_gentitle_format()); + *title = aud_tuple_formatter_process_string(ti, aud_get_gentitle_format()); *length = aud_tuple_get_int(ti, FIELD_LENGTH, NULL); ayemu_vtx_free (&tmp); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/wav/wav-sndfile.c --- a/src/wav/wav-sndfile.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/wav/wav-sndfile.c Sat Oct 13 20:43:07 2007 -0500 @@ -294,7 +294,7 @@ tuple = aud_tuple_new_from_filename(filename); fill_song_tuple(filename, tuple); - title = aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); if (*title == '\0') { g_free(title); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/wav/wav.c --- a/src/wav/wav.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/wav/wav.c Sat Oct 13 20:43:07 2007 -0500 @@ -184,7 +184,7 @@ aud_tuple_associate_string(tuple, FIELD_CODEC, NULL, "RIFF/WAV Audio (ADPCM)"); aud_tuple_associate_string(tuple, FIELD_QUALITY, NULL, "lossless"); - title = aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); if (*title == '\0') { g_free(title); diff -r f7deb2ae6f0a -r 2f2ffbc2d04d src/wma/wma.c --- a/src/wma/wma.c Sat Oct 13 20:38:34 2007 -0500 +++ b/src/wma/wma.c Sat Oct 13 20:43:07 2007 -0500 @@ -299,7 +299,7 @@ _assoc_int(ti, FIELD_TRACK_NUMBER, in->track); _assoc_int(ti, FIELD_LENGTH, in->duration / 1000); - ret = aud_tuple_formatter_make_title_string(ti, get_gentitle_format()); + ret = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format()); return ret; } @@ -320,7 +320,7 @@ return; (*len_real) = aud_tuple_get_int(tuple, FIELD_LENGTH, NULL); - (*title_real) = aud_tuple_formatter_make_title_string(tuple, get_gentitle_format()); + (*title_real) = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format()); } static void wma_playbuff(InputPlayback *playback, int out_size)