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/settings_list.c | |
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/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index ab6af2dfad..2f68077901 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -231,18 +231,6 @@ static int32_t backlight_getlang(int value) | |||
231 | return TALK_ID(value, UNIT_SEC); | 231 | return TALK_ID(value, UNIT_SEC); |
232 | } | 232 | } |
233 | #endif | 233 | #endif |
234 | /* ffwd/rewind and scan acceleration stuff */ | ||
235 | static const unsigned char ff_rewind_min_stepvals[] = {1,2,3,4,5,6,8,10,15,20,25,30,45,60}; | ||
236 | static int32_t ff_rewind_min_step_getlang(int value) | ||
237 | { | ||
238 | return TALK_ID(ff_rewind_min_stepvals[value], UNIT_SEC); | ||
239 | } | ||
240 | static void ff_rewind_min_step_formatter(char *buffer, size_t buffer_size, | ||
241 | int val, const char *unit) | ||
242 | { | ||
243 | (void)unit; | ||
244 | snprintf(buffer, buffer_size, "%ds", ff_rewind_min_stepvals[val]); | ||
245 | } | ||
246 | static int32_t scanaccel_getlang(int value) | 234 | static int32_t scanaccel_getlang(int value) |
247 | { | 235 | { |
248 | if (value == 0) | 236 | if (value == 0) |
@@ -259,12 +247,11 @@ static void scanaccel_formatter(char *buffer, size_t buffer_size, | |||
259 | snprintf(buffer, buffer_size, "2x/%ds", val); | 247 | snprintf(buffer, buffer_size, "2x/%ds", val); |
260 | } | 248 | } |
261 | 249 | ||
262 | static const unsigned char poweroff_idle_timer_times[] = {0,1,2,3,4,5,6,7,8,9,10,15,30,45,60}; | ||
263 | static int32_t poweroff_idle_timer_getlang(int value) | 250 | static int32_t poweroff_idle_timer_getlang(int value) |
264 | { | 251 | { |
265 | if (value == 0) | 252 | if (value == 0) |
266 | return LANG_OFF; | 253 | return LANG_OFF; |
267 | return TALK_ID(poweroff_idle_timer_times[value], UNIT_MIN); | 254 | return TALK_ID(value, UNIT_MIN); |
268 | } | 255 | } |
269 | static void poweroff_idle_timer_formatter(char *buffer, size_t buffer_size, | 256 | static void poweroff_idle_timer_formatter(char *buffer, size_t buffer_size, |
270 | int val, const char *unit) | 257 | int val, const char *unit) |
@@ -273,7 +260,7 @@ static void poweroff_idle_timer_formatter(char *buffer, size_t buffer_size, | |||
273 | if (val == 0) | 260 | if (val == 0) |
274 | strcpy(buffer, str(LANG_OFF)); | 261 | strcpy(buffer, str(LANG_OFF)); |
275 | else | 262 | else |
276 | snprintf(buffer, buffer_size, "%dm", poweroff_idle_timer_times[val]); | 263 | snprintf(buffer, buffer_size, "%dm", val); |
277 | } | 264 | } |
278 | 265 | ||
279 | #ifndef HAVE_SCROLLWHEEL | 266 | #ifndef HAVE_SCROLLWHEEL |
@@ -481,10 +468,10 @@ const struct settings_list settings[] = { | |||
481 | #endif /* HAVE_LCD_BITMAP */ | 468 | #endif /* HAVE_LCD_BITMAP */ |
482 | OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), | 469 | OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), |
483 | /* system */ | 470 | /* system */ |
484 | INT_SETTING_W_CFGVALS(0, poweroff, LANG_POWEROFF_IDLE, 10, "idle poweroff", | 471 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, poweroff, LANG_POWEROFF_IDLE, 10, |
485 | "off,1,2,3,4,5,6,7,8,9,10,15,30,45,60", UNIT_MIN, | 472 | "idle poweroff", "off", UNIT_MIN, poweroff_idle_timer_formatter, |
486 | 0, 14, 1, poweroff_idle_timer_formatter, | 473 | poweroff_idle_timer_getlang, set_poweroff_timeout, 15, |
487 | poweroff_idle_timer_getlang, set_poweroff_timeout), | 474 | 0,1,2,3,4,5,6,7,8,9,10,15,30,45,60), |
488 | SYSTEM_SETTING(NVRAM(4),runtime,0), | 475 | SYSTEM_SETTING(NVRAM(4),runtime,0), |
489 | SYSTEM_SETTING(NVRAM(4),topruntime,0), | 476 | SYSTEM_SETTING(NVRAM(4),topruntime,0), |
490 | 477 | ||
@@ -639,10 +626,9 @@ const struct settings_list settings[] = { | |||
639 | OFFON_SETTING(0,play_selected,LANG_PLAY_SELECTED,true,"play selected",NULL), | 626 | OFFON_SETTING(0,play_selected,LANG_PLAY_SELECTED,true,"play selected",NULL), |
640 | OFFON_SETTING(0,party_mode,LANG_PARTY_MODE,false,"party mode",NULL), | 627 | OFFON_SETTING(0,party_mode,LANG_PARTY_MODE,false,"party mode",NULL), |
641 | OFFON_SETTING(0,fade_on_stop,LANG_FADE_ON_STOP,true,"volume fade",NULL), | 628 | OFFON_SETTING(0,fade_on_stop,LANG_FADE_ON_STOP,true,"volume fade",NULL), |
642 | INT_SETTING_W_CFGVALS(0, ff_rewind_min_step, LANG_FFRW_STEP, FF_REWIND_1000, | 629 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, ff_rewind_min_step, |
643 | "scan min step", "1,2,3,4,5,6,8,10,15,20,25,30,45,60", UNIT_SEC, | 630 | LANG_FFRW_STEP, 1, "scan min step", NULL, UNIT_SEC, |
644 | 13, 0, -1, ff_rewind_min_step_formatter, | 631 | NULL, NULL, NULL, 14, 1,2,3,4,5,6,8,10,15,20,25,30,45,60), |
645 | ff_rewind_min_step_getlang, NULL), | ||
646 | INT_SETTING(0, ff_rewind_accel, LANG_FFRW_ACCEL, 3, "scan accel", | 632 | INT_SETTING(0, ff_rewind_accel, LANG_FFRW_ACCEL, 3, "scan accel", |
647 | UNIT_SEC, 16, 0, -1, scanaccel_formatter, scanaccel_getlang, NULL), | 633 | UNIT_SEC, 16, 0, -1, scanaccel_formatter, scanaccel_getlang, NULL), |
648 | #if (CONFIG_CODEC == SWCODEC) && !defined(HAVE_FLASH_STORAGE) | 634 | #if (CONFIG_CODEC == SWCODEC) && !defined(HAVE_FLASH_STORAGE) |