changeset 1489:d018975175f4

make use of get_gentitle_format() and tuple_formatter_make_title_string()
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Mon, 13 Aug 2007 20:24:36 +0900
parents ae78c9753da8
children 032053ca08ab
files src/vorbis/vorbis.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
     {