# HG changeset patch
# User nenolod
# Date 1151523969 25200
# Node ID 8a874906535bc864ad1256c5f92bd7ce856507d3
# Parent  961f3f0aa2e8e43131c8841a3b736a54813e06fe
[svn] - use a more standard-looking default title format

diff -r 961f3f0aa2e8 -r 8a874906535b ChangeLog
--- a/ChangeLog	Wed Jun 28 12:24:47 2006 -0700
+++ b/ChangeLog	Wed Jun 28 12:46:09 2006 -0700
@@ -1,3 +1,13 @@
+2006-06-28 19:24:47 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1604]
+  - sanity checking prevents us from exploding when we encounter a file we don't support
+  
+
+  Changes:        Modified:
+  +21 -3          trunk/Plugins/Input/aac/mp4ff/mp4ff.c  
+  +3 -0           trunk/Plugins/Input/aac/src/libmp4.c  
+
+
 2006-06-28 18:59:29 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1602]
   - cleanups
diff -r 961f3f0aa2e8 -r 8a874906535b audacious/main.c
--- a/audacious/main.c	Wed Jun 28 12:24:47 2006 -0700
+++ b/audacious/main.c	Wed Jun 28 12:46:09 2006 -0700
@@ -188,7 +188,7 @@
     FALSE,                      /* show window decorations */
     8,                          /* mouse wheel scroll step */
     FALSE,                      /* playlist transparent */
-    4,                          /* 5th preset (ARTIST [ ALBUM ] - TRACK. TITLE) */
+    2,                          /* 3rd preset (ARTIST - ALBUM - TITLE) */
     NULL,                       /* title format */
     FALSE,                      /* software volume control enabled */
     TRUE,                       /* UNUSED (XMMS compatibility mode) */
@@ -530,7 +530,7 @@
         cfg.mainwin_font = g_strdup(MAINWIN_DEFAULT_FONT);
 
     if (!cfg.gentitle_format)
-        cfg.gentitle_format = g_strdup("%{p:%p %}%{a:[ %a ] %}%{p:- %}%{n:%n. %}%{t:%t%}");
+        cfg.gentitle_format = g_strdup("%{p:%p - %}%{a:%a - %}%t");
 
     if (!cfg.outputplugin) {
 #ifdef HAVE_OSS