# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1186736294 18000
# Node ID c1f506c2b1d0a9c596526bdd5b9900680578bcd2
# Parent  6600abe94a3f13b3b68ddd0d9a3cc909c07db2cd
new format strings

diff -r 6600abe94a3f -r c1f506c2b1d0 src/audacious/main.c
--- a/src/audacious/main.c	Fri Aug 10 03:50:41 2007 -0500
+++ b/src/audacious/main.c	Fri Aug 10 03:58:14 2007 -0500
@@ -246,12 +246,12 @@
 } bmp_cfg_strent;
 
 const gchar *bmp_titlestring_presets[] = {
-    "%t",
-    "%{p:%p - %}%t",
-    "%{p:%p - %}%{a:%a - %}%t",
-    "%{p:%p - %}%{a:%a - %}%{n:%n. %}%t",
-    "%{p:%p %}%{a:[ %a ] %}%{p:- %}%{n:%n. %}%{t:%t%}",
-    "%{a:%a - %}%t"
+    "${title}",
+    "${?artist:${artist} - }${title}",
+    "${?artist:${artist} - }${?album:${album} - }${title}",
+    "${?artist:${artist} - }${?album:${album} - }${?track-number:${track-number}. }${title}",
+    "${?artist:${artist} }${?album:[ ${album} ] }${?artist:- }${?track-number:${track-number}. }${title}",
+    "${?album:${album} - }${title}"
 };
 
 const guint n_titlestring_presets = G_N_ELEMENTS(bmp_titlestring_presets);
@@ -629,7 +629,7 @@
         cfg.mainwin_font = g_strdup(MAINWIN_DEFAULT_FONT);
 
     if (!cfg.gentitle_format)
-        cfg.gentitle_format = g_strdup("%{p:%p - %}%{a:%a - %}%t");
+        cfg.gentitle_format = g_strdup("%{?artist:${artist} - }${?album:${album} - }${title}");
 
     if (!cfg.outputplugin) {
     gint iter;