USB Related:

    Consolidated some more of the USB code in the WPS.
    Have backlight turn offf when USB Connected.
menu.c:
    LINE_X was set wrong for player.
settings_menu.c / wps-display.c:
    Added 1 Line ID3+. Has progress bar & Kbps.
    Renamed some of the WPS options to be more readable.
wps.c / wps-display.c
    Fixed problem with FF/REW when 'Remaining Time' is on.
    Added %pb to the WPS mix. Player progress bar thingy.
    Thanks to whoever fixed my PLAYER_PROGRESS function :-)
    Changed how volume changes on player (works better now).
    General cleanup of Custom WPS code.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2091 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 5 deletions

diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 0d25fc9..22468b6 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -21,13 +21,13 @@
 
 #include <stdio.h>
 #include <stdbool.h>
+
 #include "lcd.h"
 #include "menu.h"
 #include "mpeg.h"
 #include "button.h"
 #include "kernel.h"
 #include "sprintf.h"
-
 #include "settings.h"
 #include "settings_menu.h"
 #include "backlight.h"
@@ -97,12 +97,12 @@ static Menu scroll_speed(void)
 static Menu wps_set(void)
 {
 #ifdef HAVE_LCD_BITMAP
-    char* names[] = { "ID3 Tags   ", "File      ", "Parse     ", "Custom WPS  " };
+    char* names[] = { "ID3 Tags   ", "Filename  ", "Dir Parse  ", "Custom WPS  " };
     set_option("[WPS display]", &global_settings.wps_display, names, 4 );
 #else
-    char* names[] = { "1 Line ID3", "2 Line ID3", "File       ",
-        "Parse     ", "Custom WPS " };
-    set_option("[WPS display]", &global_settings.wps_display, names, 5 );
+    char* names[] = { "1 Line ID3 ", "1 Line ID3+", "2 Line ID3 ", "Filename   ",
+        "Dir Parse  ", "Custom WPS " };
+    set_option("[WPS display]", &global_settings.wps_display, names, 6 );
 #endif
     return MENU_OK;
 }