Merged Magnus Holmgren's wps.config code.

Moved wps.config from root to /.rockbox dir.
Removed WPS display setting.


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

1 files changed, 0 insertions, 14 deletions

diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 22468b642e..eeb6af8e71 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -94,19 +94,6 @@ static Menu scroll_speed(void)
     return MENU_OK;
 }
 
-static Menu wps_set(void)
-{
-#ifdef HAVE_LCD_BITMAP
-    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 ", "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;
-}
-
 #ifdef HAVE_CHARGE_CTRL
 static Menu deep_discharge(void)
 {
@@ -188,7 +175,6 @@ Menu settings_menu(void)
         { "Backlight Timer", backlight_timer },
         { "Contrast",        contrast    },  
         { "Scroll speed",    scroll_speed    },  
-        { "While Playing",   wps_set         },
 #ifdef HAVE_CHARGE_CTRL
         { "Deep discharge",  deep_discharge  },
 #endif