Index: wps.c
===================================================================
RCS file: /cvsroot/rockbox/apps/wps.c,v
retrieving revision 1.25
diff -u -r1.25 wps.c
--- wps.c	5 Jul 2002 07:20:47 -0000	1.25
+++ wps.c	9 Jul 2002 03:27:57 -0000
@@ -75,6 +75,7 @@
         }
         case PLAY_DISPLAY_FILENAME_SCROLL:
         {
+            char buffer[32];
             char ch = '/';
             char* szLast = strrchr(id3->path, ch);
 
@@ -82,6 +83,14 @@
                 lcd_puts_scroll(0,0, (++szLast));
             else
                 lcd_puts_scroll(0,0, id3->path);
+
+            // Display time with the filename scroll only because the screen has room. 
+            snprintf(buffer,sizeof(buffer), "Time: %d:%02d / %d:%02d",
+                     id3->elapsed / 60000,
+                     id3->elapsed % 60000 / 1000,
+                     id3->length / 60000,
+                     id3->length % 60000 / 1000 );
+            lcd_puts(0, 1, buffer);
             break;
         }
         case PLAY_DISPLAY_DEFAULT:
@@ -96,7 +105,7 @@
             lcd_puts(0, l++, id3->artist?id3->artist:"");
 
             if(id3->vbr)
-                snprintf(buffer, sizeof(buffer), "Variable Bit Rate");
+                snprintf(buffer, sizeof(buffer), "%d kbits (VBR)", id3->bitrate);
             else
                 snprintf(buffer, sizeof(buffer), "%d kbits", id3->bitrate);
                 
@@ -113,6 +122,18 @@
             break;
         }
     }
+
+#ifdef HAVE_LCD_BITMAP
+    // add the time for recorders
+    char buffer[32];
+    snprintf(buffer,sizeof(buffer), "Time: %d:%02d / %d:%02d",
+             id3->elapsed / 60000,
+             id3->elapsed % 60000 / 1000,
+             id3->length / 60000,
+             id3->length % 60000 / 1000 );
+    lcd_puts(0, 6, buffer);
+#endif
+
     lcd_update();
 }
 
@@ -149,26 +170,22 @@
         if (playing)
         {
 #ifdef HAVE_LCD_BITMAP
-            snprintf(buffer,sizeof(buffer), "Time: %d:%02d / %d:%02d",
+            snprintf(buffer,sizeof(buffer), "%d:%02d",
                      id3->elapsed / 60000,
-                     id3->elapsed % 60000 / 1000,
-                     id3->length / 60000,
-                     id3->length % 60000 / 1000 );
+                     id3->elapsed % 60000 / 1000 );
 
-            lcd_puts(0, 6, buffer);
+            lcd_puts(strlen("Time: "), 6, buffer);
             lcd_update();
 #else
             // Display time with the filename scroll only because the screen has room. 
             if (global_settings.wps_display == PLAY_DISPLAY_FILENAME_SCROLL)
             { 
 
-                snprintf(buffer,sizeof(buffer), "Time: %d:%02d / %d:%02d",
+                snprintf(buffer,sizeof(buffer), "%d:%02d",
                          id3->elapsed / 60000,
-                         id3->elapsed % 60000 / 1000,
-                         id3->length / 60000,
-                         id3->length % 60000 / 1000 );
+                         id3->elapsed % 60000 / 1000 );
+                lcd_puts(strlen("Time: "), 1, buffer);
 
-                lcd_puts(0, 1, buffer);
                 lcd_update();
            }
 #endif