summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorRichard Quirk <richard.quirk@gmail.com>2012-10-05 21:30:13 +0200
committerJonathan Gordon <rockbox@jdgordon.info>2012-10-06 11:59:13 +0200
commit71f70112b2484e45b332fd7f2da137145aa05e9d (patch)
tree84353c0f8e1fc09d07e3ffa887ae8bb37dd02112 /apps
parent9ee396b846a923a415d023be537cf5a2fc3bb78f (diff)
downloadrockbox-71f70112b2484e45b332fd7f2da137145aa05e9d.tar.gz
rockbox-71f70112b2484e45b332fd7f2da137145aa05e9d.zip
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.c4
-rw-r--r--apps/settings.c2
-rw-r--r--apps/shortcuts.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index f2249e3a57..fbc83fd60d 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)
438/* If a sleep timer is running, cancel it, otherwise start one */ 438/* If a sleep timer is running, cancel it, otherwise start one */
439static int toggle_sleeptimer(void) 439static int toggle_sleeptimer(void)
440{ 440{
441 set_sleep_timer(get_sleep_timer() ? 0 441 set_sleeptimer_duration(get_sleep_timer() ? 0
442 : global_settings.sleeptimer_duration * 60); 442 : global_settings.sleeptimer_duration);
443 return 0; 443 return 0;
444} 444}
445 445
diff --git a/apps/settings.c b/apps/settings.c
index 3bf9c5bf17..e2a6efa3d8 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -842,7 +842,7 @@ void settings_apply(bool read_disk)
842#endif 842#endif
843 set_poweroff_timeout(global_settings.poweroff); 843 set_poweroff_timeout(global_settings.poweroff);
844 if (global_settings.sleeptimer_on_startup) 844 if (global_settings.sleeptimer_on_startup)
845 set_sleep_timer(global_settings.sleeptimer_duration * 60); 845 set_sleeptimer_duration(global_settings.sleeptimer_duration);
846 set_keypress_restarts_sleep_timer( 846 set_keypress_restarts_sleep_timer(
847 global_settings.keypress_restarts_sleeptimer); 847 global_settings.keypress_restarts_sleeptimer);
848 848
diff --git a/apps/shortcuts.c b/apps/shortcuts.c
index 50b8decfc6..ee8454485d 100644
--- a/apps/shortcuts.c
+++ b/apps/shortcuts.c
@@ -528,7 +528,7 @@ int do_shortcut_menu(void *ignored)
528#endif 528#endif
529 { 529 {
530 char timer_buf[10]; 530 char timer_buf[10];
531 set_sleep_timer(sc->u.timedata.sleep_timeout * 60); 531 set_sleeptimer_duration(sc->u.timedata.sleep_timeout);
532 splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER), 532 splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER),
533 sleep_timer_formatter(timer_buf, sizeof(timer_buf), 533 sleep_timer_formatter(timer_buf, sizeof(timer_buf),
534 sc->u.timedata.sleep_timeout, NULL)); 534 sc->u.timedata.sleep_timeout, NULL));