# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1131534242 0
# Node ID b20300813b423346bbb743717baf2b56cfcfd1d3
# Parent  d30be05ab5b0ad7fa31451dad7820de0f620600a
Moved some #defines from xs_config.c to xmms-sid.h; Changed default SID
specific title formatstring.


diff -r d30be05ab5b0 -r b20300813b42 src/xmms-sid.h
--- a/src/xmms-sid.h	Wed Nov 09 10:59:02 2005 +0000
+++ b/src/xmms-sid.h	Wed Nov 09 11:04:02 2005 +0000
@@ -87,6 +87,12 @@
 #define XS_SIDBUF_SIZE		(80*1024)
 
 
+/* libSIDPlay1 default filter values (copied from libsidplay1's headers) */
+#define XS_SIDPLAY1_FS		(400.0f)
+#define XS_SIDPLAY1_FM		(60.0f)
+#define XS_SIDPLAY1_FT		(0.05f)
+
+
 #define XS_BIN_BAILOUT		(32)	/* Binary search bailout treshold */
 
 #define XS_STIL_MAXENTRY	(128)	/* Max number of sub-songs in STIL/SLDB node */
diff -r d30be05ab5b0 -r b20300813b42 src/xs_config.c
--- a/src/xs_config.c	Wed Nov 09 10:59:02 2005 +0000
+++ b/src/xs_config.c	Wed Nov 09 11:04:02 2005 +0000
@@ -156,11 +156,6 @@
 static const gint xs_widtable_max = (sizeof(xs_widtable) / sizeof(t_xs_wid_item));
 
 
-/* libSIDPlay1 default filter values (copied from libsidplay1's headers) */
-#define	XS_SIDPLAY1_FS	(400.0f)
-#define XS_SIDPLAY1_FM	(60.0f)
-#define XS_SIDPLAY1_FT	(0.05f)
-
 /*
  * Reset/initialize the configuration
  */
@@ -241,7 +236,7 @@
 #else
 	xs_cfg.titleOverride = TRUE;
 #endif
-	xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) [%n]");
+	xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) [%n/%N][%m]");
 
 
 	xs_cfg.subAutoEnable = FALSE;