# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1187004276 -32400
# Node ID d018975175f446e2e468dabd67920d2a01833ef2
# Parent  ae78c9753da87ea714e860e84101a450cdf6db92
make use of get_gentitle_format() and tuple_formatter_make_title_string()

diff -r ae78c9753da8 -r d018975175f4 src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Mon Aug 13 06:08:08 2007 -0500
+++ b/src/vorbis/vorbis.c	Mon Aug 13 20:24:36 2007 +0900
@@ -608,8 +608,8 @@
     Tuple *tuple = get_song_tuple(filename);
 
     *length = tuple_get_int(tuple, "length");
-    *title = tuple_formatter_process_string(tuple, vorbis_cfg.tag_override ?
-                                  vorbis_cfg.tag_format : cfg.gentitle_format);
+    *title = tuple_formatter_make_title_string(tuple, vorbis_cfg.tag_override ?
+                                            vorbis_cfg.tag_format : get_gentitle_format());
 
     tuple_free(tuple);
 }
@@ -829,8 +829,8 @@
 
     input = get_tuple_for_vorbisfile(vorbisfile, filename, vorbis_is_streaming);
 
-    displaytitle = tuple_formatter_process_string(input, vorbis_cfg.tag_override ?
-                                              vorbis_cfg.tag_format : cfg.gentitle_format);
+    displaytitle = tuple_formatter_make_title_string(input, vorbis_cfg.tag_override ?
+                                                  vorbis_cfg.tag_format : get_gentitle_format());
 
     if ((tmp = vfs_get_metadata(((VFSVorbisFile *) vorbisfile->datasource)->fd, "stream-name")) != NULL)
     {