# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1186844364 -32400
# Node ID ea806daf3ef03ab52baa4f178331535e2e730664
# Parent  612007382f0c6c25eb72cad6e0317450f9ab1ba8
rename xmms_get_gentitle_format() to get_gentitle_format().

diff -r 612007382f0c -r ea806daf3ef0 src/audacious/input.c
--- a/src/audacious/input.c	Sat Aug 11 14:54:34 2007 +0200
+++ b/src/audacious/input.c	Sat Aug 11 23:59:24 2007 +0900
@@ -609,7 +609,7 @@
 
         tuple_associate_string(tuple, "file-path", g_path_get_dirname(tmp));
 
-        tmp = tuple_formatter_process_string(tuple, cfg.gentitle_format);
+        tmp = tuple_formatter_process_string(tuple, get_gentitle_format());
         if (tmp != NULL && *tmp != '\0') {
             (*title) = str_to_utf8(tmp);
             g_free(tmp);
diff -r 612007382f0c -r ea806daf3ef0 src/audacious/main.c
--- a/src/audacious/main.c	Sat Aug 11 14:54:34 2007 +0200
+++ b/src/audacious/main.c	Sat Aug 11 23:59:24 2007 +0900
@@ -453,7 +453,7 @@
 }
 
 const gchar *
-xmms_get_gentitle_format(void)
+get_gentitle_format(void)
 {
     guint titlestring_preset = cfg.titlestring_preset;
 
diff -r 612007382f0c -r ea806daf3ef0 src/audacious/playlist.c
--- a/src/audacious/playlist.c	Sat Aug 11 14:54:34 2007 +0200
+++ b/src/audacious/playlist.c	Sat Aug 11 23:59:24 2007 +0900
@@ -239,7 +239,7 @@
     /* entry is still around */
     formatter = tuple_get_string(tuple, "formatter");
     entry->title = tuple_formatter_process_string(tuple, formatter ?
-                                                  formatter : xmms_get_gentitle_format());
+                                                  formatter : get_gentitle_format());
     entry->length = tuple_get_int(tuple, "length");
     entry->tuple = tuple;
 
@@ -676,7 +676,7 @@
     if (tuple != NULL) {
         const gchar *formatter = tuple_get_string(tuple, "formatter");
         entry->title = tuple_formatter_process_string(tuple, formatter ?
-                                                      formatter : xmms_get_gentitle_format());
+                                                      formatter : get_gentitle_format());
         entry->length = tuple_get_int(tuple, "length");
         entry->tuple = tuple;
     }
diff -r 612007382f0c -r ea806daf3ef0 src/audacious/plugin.h
--- a/src/audacious/plugin.h	Sat Aug 11 14:54:34 2007 +0200
+++ b/src/audacious/plugin.h	Sat Aug 11 23:59:24 2007 +0900
@@ -319,7 +319,7 @@
 G_BEGIN_DECLS
 
 /* So that input plugins can get the title formatting information */
-G_CONST_RETURN gchar * xmms_get_gentitle_format(void);
+G_CONST_RETURN gchar * get_gentitle_format(void);
 
 /* So that output plugins can communicate with effect plugins */
 EffectPlugin *get_current_effect_plugin(void);