Fix bug in action_getstatus() where it didnt store the last action so it

never returned ACTION_REPEAT
Fix backlight fade out options to include 3s,5s,10s


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12722 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-03-11 12:32:29 +00:00
parent 2eefb5acb8
commit 04ea446edc
2 changed files with 4 additions and 2 deletions

View file

@ -192,6 +192,7 @@ static int get_action_worker(int context, int timeout,
repeated = false;
last_button = button;
last_action = ret;
return ret;
}

View file

@ -529,9 +529,10 @@ const struct settings_list settings[] = {
LANG_OFF, TALK_ID(500, UNIT_MS),
TALK_ID(1, UNIT_SEC), TALK_ID(2, UNIT_SEC)),
STRINGCHOICE_SETTING(0,backlight_fade_out, LANG_BACKLIGHT_FADE_OUT, 1,
"backlight fade out","off,500ms,1s,2s", backlight_set_fade_out, 4,
"backlight fade out","off,500ms,1s,2s,3s,5s,10s", backlight_set_fade_out, 7,
LANG_OFF, TALK_ID(500, UNIT_MS),
TALK_ID(1, UNIT_SEC), TALK_ID(2, UNIT_SEC)),
TALK_ID(1, UNIT_SEC), TALK_ID(2, UNIT_SEC),
TALK_ID(3, UNIT_SEC), TALK_ID(5, UNIT_SEC), TALK_ID(10, UNIT_SEC)),
#endif
INT_SETTING(0, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed",
UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed),