diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-11-25 20:05:04 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-11-25 20:05:04 +0000 |
commit | e54244480dd003a8fd0cc315089ff69da62ed230 (patch) | |
tree | fbd26b26e5e3fdc6dbb3bdbdcad70d32b5002411 /apps/gui | |
parent | d63f2375a20e37c12a93737b34d723fb8cac3c26 (diff) | |
download | rockbox-e54244480dd003a8fd0cc315089ff69da62ed230.tar.gz rockbox-e54244480dd003a8fd0cc315089ff69da62ed230.zip |
Convert 2 more settings to table settings. * Fix duplicate value display if the first value is selected in a table setting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps-common.c | 9 | ||||
-rw-r--r-- | apps/gui/option_select.c | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index ee0bc3bdb4..5f421de2d8 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -145,13 +145,6 @@ bool update_onvol_change(struct gui_wps * gwps) | |||
145 | 145 | ||
146 | bool ffwd_rew(int button) | 146 | bool ffwd_rew(int button) |
147 | { | 147 | { |
148 | static const uint16_t ff_rew_steps[] = { | ||
149 | 1000, 2000, 3000, 4000, | ||
150 | 5000, 6000, 8000, 10000, | ||
151 | 15000, 20000, 25000, 30000, | ||
152 | 45000, 60000 | ||
153 | }; | ||
154 | |||
155 | unsigned int step = 0; /* current ff/rewind step */ | 148 | unsigned int step = 0; /* current ff/rewind step */ |
156 | unsigned int max_step = 0; /* maximum ff/rewind step */ | 149 | unsigned int max_step = 0; /* maximum ff/rewind step */ |
157 | int ff_rewind_count = 0; /* current ff/rewind count (in ticks) */ | 150 | int ff_rewind_count = 0; /* current ff/rewind count (in ticks) */ |
@@ -227,7 +220,7 @@ bool ffwd_rew(int button) | |||
227 | 220 | ||
228 | wps_state.ff_rewind = true; | 221 | wps_state.ff_rewind = true; |
229 | 222 | ||
230 | step = ff_rew_steps[global_settings.ff_rewind_min_step]; | 223 | step = 1000 * global_settings.ff_rewind_min_step; |
231 | 224 | ||
232 | accel_tick = current_tick + | 225 | accel_tick = current_tick + |
233 | global_settings.ff_rewind_accel*HZ; | 226 | global_settings.ff_rewind_accel*HZ; |
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index a72cdb5a60..2feece3b94 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -398,9 +398,9 @@ bool option_screen(struct settings_list *setting, | |||
398 | const struct table_setting *info = setting->table_setting; | 398 | const struct table_setting *info = setting->table_setting; |
399 | int i; | 399 | int i; |
400 | nb_items = info->count; | 400 | nb_items = info->count; |
401 | selected = 0; | 401 | selected = -1; |
402 | table_setting_array_position = -1; | 402 | table_setting_array_position = -1; |
403 | for (i=0;selected==0 && i<nb_items;i++) | 403 | for (i=0;selected==-1 && i<nb_items;i++) |
404 | { | 404 | { |
405 | if (setting->flags&F_ALLOW_ARBITRARY_VALS && | 405 | if (setting->flags&F_ALLOW_ARBITRARY_VALS && |
406 | (oldvalue < info->values[i])) | 406 | (oldvalue < info->values[i])) |