update to the ff/rw options accelerate options

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

4 files changed, 11 insertions, 25 deletions

diff --git a/apps/settings.c b/apps/settings.c
index bb64886..10ebcbb 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -65,12 +65,11 @@ offset  abs
 0x0d    0x21    <resume settings byte>
 0x0e    0x22    <shuffle,mp3filter,sort_case,discharge,statusbar,show_hidden>
 0x0f    0x23    <scroll speed & WPS display byte>
-0x10    0x24    <ff/rewind step size>
+0x10    0x24    <ff/rewind accleration rate>
 0x11    0x25    <AVC byte>
 0x12    0x26    <(int) Resume playlist index, or -1 if no playlist resume>
 0x16    0x2a    <(int) Byte offset into resume file>
 0x1a    0x2e    <time until disk spindown>
-0x1b    0x2f    <ff/rewind acceleration rate>
 
         <all unused space filled with 0xff>
 
@@ -268,10 +267,9 @@ int settings_save( void )
         ((global_settings.scroll_speed << 3) |
          (global_settings.wps_display & 7));
     
-    config_block[0x10] = (unsigned char)global_settings.ff_rewind;
+    config_block[0x10] = (unsigned char)global_settings.ff_rewind_accel;
     config_block[0x11] = (unsigned char)global_settings.avc;
     config_block[0x1a] = (unsigned char)global_settings.disk_spindown;
-    config_block[0x1b] = (unsigned char)global_settings.ff_rewind_accel;
 
     memcpy(&config_block[0x12], &global_settings.resume_index, 4);
     memcpy(&config_block[0x16], &global_settings.resume_offset, 4);
@@ -362,7 +360,7 @@ void settings_load(void)
             global_settings.wps_display = c;
         
         if (config_block[0x10] != 0xFF)
-            global_settings.ff_rewind = config_block[0x10];
+            global_settings.ff_rewind_accel = config_block[0x10];
 
         if (config_block[0x11] != 0xFF)
             global_settings.avc = config_block[0x11];
@@ -376,9 +374,6 @@ void settings_load(void)
         if (config_block[0x1a] != 0xFF)
             global_settings.disk_spindown = config_block[0x1a];
 
-        if (config_block[0x1b] != 0xFF)
-            global_settings.ff_rewind_accel = config_block[0x1b];
-
         memcpy(&global_settings.resume_seed, &config_block[0xF8], 4);
 
         if (config_block[0x24] != 0xFF)
@@ -424,7 +419,6 @@ void settings_reset(void) {
     global_settings.total_uptime = 0;
     global_settings.scroll_speed = 8;
     global_settings.show_hidden_files = false;
-    global_settings.ff_rewind    = DEFAULT_FF_REWIND_SETTING;
     global_settings.ff_rewind_accel = DEFAULT_FF_REWIND_ACCEL_SETTING;
     global_settings.resume_index = -1;
     global_settings.resume_offset = -1;
diff --git a/apps/settings.h b/apps/settings.h
index b67af46..831a70a 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -63,7 +63,6 @@ struct user_settings
     bool sort_case;    /* dir sort order: 0=case insensitive, 1=sensitive */
     int scroll_speed;  /* long texts scrolling speed: 1-20 */
     bool playlist_shuffle;
-    int ff_rewind;     /* FF/Rewind step size (in seconds) */
     int ff_rewind_accel; /* FF/Rewind acceleration (in seconds per doubling) */
     int disk_spindown; /* time until disk spindown, in seconds (0=off) */
 
@@ -115,7 +114,6 @@ extern struct user_settings global_settings;
 #define DEFAULT_POWEROFF_SETTING    0
 #define DEFAULT_BACKLIGHT_SETTING   5
 #define DEFAULT_WPS_DISPLAY         0 
-#define DEFAULT_FF_REWIND_SETTING   2
 #define DEFAULT_FF_REWIND_ACCEL_SETTING 3
 
 #endif /* __SETTINGS_H__ */
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index ffc6f6a..1c073b1 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -165,13 +165,6 @@ static Menu timedate_set(void)
 }
 #endif
 
-static Menu ff_rewind(void)
-{
-    set_int("[FF/Rewind Step Size]", "s", &global_settings.ff_rewind,
-            NULL, 1, 1, 254 );
-    return MENU_OK;
-}
-
 static Menu spindown(void)
 {
     set_int("[Disk spindown]", "s", &global_settings.disk_spindown,
@@ -183,9 +176,10 @@ static Menu ff_rewind_accel(void)
 {
     char* names[] = { "off   ", "2x/1s ", "2x/2s ", "2x/3s ",
                       "2x/4s ", "2x/5s ", "2x/6s ", "2x/7s ",
-                      "2x/8s ", "2x/9s ", "2x/10s" };
-    set_option("[FF/Rewind Accel]", &global_settings.ff_rewind_accel,
-               names, 11 );
+                      "2x/8s ", "2x/9s ", "2x/10s", "2x/11s",
+                      "2x/12s", "2x/13s", "2x/14s", "2x/15s", };
+    set_option("[FF/rewind accel]", &global_settings.ff_rewind_accel,
+               names, 16 );
     return MENU_OK;
 }
 
@@ -209,8 +203,7 @@ Menu settings_menu(void)
         { "Time/Date",       timedate_set    },
 #endif
         { "Show hidden files", show_hidden_files },
-        { "FF/Rewind",       ff_rewind       },
-        { "FF/Rewind Accel", ff_rewind_accel },
+        { "FF/rewind accel", ff_rewind_accel },
         { "Resume",          resume          },
         { "Disk spindown",   spindown        },
     };
diff --git a/apps/wps.c b/apps/wps.c
index 55afd4d..7e7597c 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -44,6 +44,7 @@
 #include "ajf.h"
 #endif
 
+#define FF_REWIND_MIN_STEP 1000 /* minimum ff/rewind step is 1 second */
 #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */
                                 /* 3% of 30min file == 54s step size */
 
@@ -884,7 +885,7 @@ int wps_show(void)
                             ff_rewind = true;
                             ff_rewind_max_step =
                                 id3->length * FF_REWIND_MAX_PERCENT / 100;
-                            ff_rewind_step = global_settings.ff_rewind*1000;
+                            ff_rewind_step = FF_REWIND_MIN_STEP;
                             if (ff_rewind_step > ff_rewind_max_step)
                                 ff_rewind_step = ff_rewind_max_step;
                             ff_rewind_count = -ff_rewind_step;
@@ -933,7 +934,7 @@ int wps_show(void)
                             ff_rewind = true;
                             ff_rewind_max_step =
                                 id3->length * FF_REWIND_MAX_PERCENT / 100;
-                            ff_rewind_step = global_settings.ff_rewind*1000;
+                            ff_rewind_step = FF_REWIND_MIN_STEP;
                             if (ff_rewind_step > ff_rewind_max_step)
                                 ff_rewind_step = ff_rewind_max_step;
                             ff_rewind_count = ff_rewind_step;