diff options
| author | Richard Quirk <richard.quirk@gmail.com> | 2012-10-05 21:30:13 +0200 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2012-10-06 11:59:13 +0200 |
| commit | 71f70112b2484e45b332fd7f2da137145aa05e9d (patch) | |
| tree | 84353c0f8e1fc09d07e3ffa887ae8bb37dd02112 /apps | |
| parent | 9ee396b846a923a415d023be537cf5a2fc3bb78f (diff) | |
| download | rockbox-71f70112b2484e45b332fd7f2da137145aa05e9d.zip rockbox-71f70112b2484e45b332fd7f2da137145aa05e9d.tar.gz rockbox-71f70112b2484e45b332fd7f2da137145aa05e9d.tar.bz2 rockbox-71f70112b2484e45b332fd7f2da137145aa05e9d.tar.xz | |
Add set_sleeptimer_duration function in minutes
Make set_sleep_timer a static function and only call
set_sleeptimer_duration externally, which is always called with minutes
values.
Change-Id: I985308bf014e354f91c47a0b2bf62f4f5a591919
Reviewed-on: http://gerrit.rockbox.org/327
Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/menus/settings_menu.c | 4 | ||||
| -rw-r--r-- | apps/settings.c | 2 | ||||
| -rw-r--r-- | apps/shortcuts.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index f2249e3..fbc83fd 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -438,8 +438,8 @@ static int sleep_timer_voice(int selected_item, void*data) /* If a sleep timer is running, cancel it, otherwise start one */ static int toggle_sleeptimer(void) { - set_sleep_timer(get_sleep_timer() ? 0 - : global_settings.sleeptimer_duration * 60); + set_sleeptimer_duration(get_sleep_timer() ? 0 + : global_settings.sleeptimer_duration); return 0; } diff --git a/apps/settings.c b/apps/settings.c index 3bf9c5b..e2a6efa 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -842,7 +842,7 @@ void settings_apply(bool read_disk) #endif set_poweroff_timeout(global_settings.poweroff); if (global_settings.sleeptimer_on_startup) - set_sleep_timer(global_settings.sleeptimer_duration * 60); + set_sleeptimer_duration(global_settings.sleeptimer_duration); set_keypress_restarts_sleep_timer( global_settings.keypress_restarts_sleeptimer); diff --git a/apps/shortcuts.c b/apps/shortcuts.c index 50b8dec..ee84544 100644 --- a/apps/shortcuts.c +++ b/apps/shortcuts.c @@ -528,7 +528,7 @@ int do_shortcut_menu(void *ignored) #endif { char timer_buf[10]; - set_sleep_timer(sc->u.timedata.sleep_timeout * 60); + set_sleeptimer_duration(sc->u.timedata.sleep_timeout); splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER), sleep_timer_formatter(timer_buf, sizeof(timer_buf), sc->u.timedata.sleep_timeout, NULL)); |