# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1186829071 18000
# Node ID 8745ffb73f49d43f611f512afa9ed0caeff23921
# Parent  70149c3555f40364f06ed52b57290864487777e5# Parent  e20c1f720153cf3b09175f6e96832f4fc51bb060
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 70149c3555f4 -r 8745ffb73f49 src/audacious/playlist.c
--- a/src/audacious/playlist.c	Sat Aug 11 05:44:21 2007 -0500
+++ b/src/audacious/playlist.c	Sat Aug 11 05:44:31 2007 -0500
@@ -238,7 +238,8 @@
 
     /* entry is still around */
     formatter = tuple_get_string(tuple, "formatter");
-    entry->title = tuple_formatter_process_string(tuple, formatter ? formatter : cfg.gentitle_format);
+    entry->title = tuple_formatter_process_string(tuple, formatter ?
+                                                  formatter : xmms_get_gentitle_format());
     entry->length = tuple_get_int(tuple, "length");
     entry->tuple = tuple;
 
@@ -674,7 +675,8 @@
     PLAYLIST_UNLOCK( playlist->mutex );
     if (tuple != NULL) {
         const gchar *formatter = tuple_get_string(tuple, "formatter");
-        entry->title = tuple_formatter_process_string(tuple, formatter ? formatter : cfg.gentitle_format);
+        entry->title = tuple_formatter_process_string(tuple, formatter ?
+                                                      formatter : xmms_get_gentitle_format());
         entry->length = tuple_get_int(tuple, "length");
         entry->tuple = tuple;
     }
diff -r 70149c3555f4 -r 8745ffb73f49 src/audacious/tuple.h
--- a/src/audacious/tuple.h	Sat Aug 11 05:44:21 2007 -0500
+++ b/src/audacious/tuple.h	Sat Aug 11 05:44:31 2007 -0500
@@ -41,5 +41,6 @@
 TupleValueType tuple_get_value_type(Tuple *tuple, const gchar *field);
 const gchar *tuple_get_string(Tuple *tuple, const gchar *field);
 int tuple_get_int(Tuple *tuple, const gchar *field);
+#define tuple_free(x) mowgli_object_unref(x);
 
 #endif