changeset 2011:90cc014f8fdc trunk

[svn] - fix for custom format bug. closes #664.
author yaz
date Sat, 25 Nov 2006 21:29:05 -0800
parents 5f19843a038b
children 563810683ed3
files ChangeLog libaudacious/titlestring.c
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Nov 25 19:19:56 2006 -0800
+++ b/ChangeLog	Sat Nov 25 21:29:05 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-26 03:19:56 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3013]
+  - xmms_urldecode_path() is no longer needed due to NewVFS layer.
+  
+  trunk/audacious/playlist.c |    3 +--
+  1 file changed, 1 insertion(+), 2 deletions(-)
+
+
 2006-11-26 03:17:17 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3011]
   - update credit for welsh translation
--- a/libaudacious/titlestring.c	Sat Nov 25 19:19:56 2006 -0800
+++ b/libaudacious/titlestring.c	Sat Nov 25 21:29:05 2006 -0800
@@ -196,7 +196,8 @@
                       (n == 'g' && VS(input, genre)) ||
                       (n == 'n' && VI(input, track_number)) ||
                       (n == 'p' && VS(input, performer)) ||
-                      (n == 't' && VS(input, track_name)))) {
+                      (n == 't' && VS(input, track_name)) ||
+                      (n == 'y' && VI(input, year)))) {
                     int nl = 0;
                     char c;
                     while ((c = *fmt++))    /* until end of string      */
@@ -242,6 +243,10 @@
             goto Print_string;
         case 't':
             string = VS(input, track_name);
+	    goto Print_string;
+        case 'y':
+            val = VI(input, year);
+	    goto Print_number;
 
           Print_string:
             if (string == NULL)
@@ -280,9 +285,6 @@
             RIGHTPAD(width - numpr);
             break;
 
-        case 'y':
-            val = VI(input, year);
-
           Print_number:
             if (val == 0)
                 break;