# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189112809 -10800
# Node ID 4dfc5a28d6813e7f443c7f59cae6d9f5fab9776e
# Parent  d6d8e3cd23c5d356eb3e7314d9f49cfb4e9f2ffc# Parent  4a03fd025aa223800a937d4b60d0b1b11d4e2d41
Branch merge.

diff -r d6d8e3cd23c5 -r 4dfc5a28d681 src/sid/xs_config.c
--- a/src/sid/xs_config.c	Thu Sep 06 03:03:03 2007 +0300
+++ b/src/sid/xs_config.c	Fri Sep 07 00:06:49 2007 +0300
@@ -280,14 +280,17 @@
 #else
 	xs_cfg.subsongControl = XS_SSC_POPUP;
 #endif
-
 	xs_cfg.detectMagic = FALSE;
 
 #ifndef HAVE_XMMSEXTRA
 	xs_cfg.titleOverride = TRUE;
 #endif
-	xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) [%n/%N][%m/%C]");
 
+#ifdef AUDACIOUS_PLUGIN
+	xs_pstrcpy(&xs_cfg.titleFormat, "${artist} - ${title} (${copyright}) <${subtune}/${subtunes}> [${sid-model}/${sid-speed}]");
+#else
+	xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) <%n/%N> [%m/%C]");
+#endif
 
 	xs_cfg.subAutoEnable = FALSE;
 	xs_cfg.subAutoMinOnly = TRUE;