len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add set_sleeptimer_duration function in minutes

Browse source 
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>
This commit is contained in:
Richard Quirk 2012-10-05 21:30:13 +02:00 • committed by Jonathan Gordon
parent 9ee396b846
commit 71f70112b2
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/menus/settings_menu.c
View file

@ -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 */ /* If a sleep timer is running, cancel it, otherwise start one */
static int toggle_sleeptimer(void) static int toggle_sleeptimer(void)
{ {
set_sleep_timer(get_sleep_timer() ? 0 set_sleeptimer_duration(get_sleep_timer() ? 0
: global_settings.sleeptimer_duration * 60); : global_settings.sleeptimer_duration);
return 0; return 0;
} }

2
apps/settings.c
View file

@ -842,7 +842,7 @@ void settings_apply(bool read_disk)
#endif #endif
set_poweroff_timeout(global_settings.poweroff); set_poweroff_timeout(global_settings.poweroff);
if (global_settings.sleeptimer_on_startup) 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( set_keypress_restarts_sleep_timer(
global_settings.keypress_restarts_sleeptimer); global_settings.keypress_restarts_sleeptimer);

2
apps/shortcuts.c
View file

@ -528,7 +528,7 @@ int do_shortcut_menu(void *ignored)
#endif #endif
{ {
char timer_buf[10]; 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), splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER),
sleep_timer_formatter(timer_buf, sizeof(timer_buf), sleep_timer_formatter(timer_buf, sizeof(timer_buf),
sc->u.timedata.sleep_timeout, NULL)); sc->u.timedata.sleep_timeout, NULL));

2
firmware/export/powermgmt.h
View file

@ -167,7 +167,7 @@ void set_battery_capacity(int capacity); /* set local battery capacity value */
int get_battery_capacity(void); /* get local battery capacity value */ int get_battery_capacity(void); /* get local battery capacity value */
void set_battery_type(int type); /* set local battery type */ void set_battery_type(int type); /* set local battery type */
void set_sleep_timer(int seconds); void set_sleeptimer_duration(int minutes);
int get_sleep_timer(void); int get_sleep_timer(void);
void set_keypress_restarts_sleep_timer(bool enable); void set_keypress_restarts_sleep_timer(bool enable);
void handle_auto_poweroff(void); void handle_auto_poweroff(void);

8
firmware/powermgmt.c
View file

@ -60,6 +60,7 @@ int last_sent_battery_level = 100;
/* battery level (0-100%) */ /* battery level (0-100%) */
int battery_percent = -1; int battery_percent = -1;
void send_battery_level_event(void); void send_battery_level_event(void);
static void set_sleep_timer(int seconds);
static bool sleeptimer_active = false; static bool sleeptimer_active = false;
static long sleeptimer_endtick; static long sleeptimer_endtick;
@ -863,7 +864,12 @@ void send_battery_level_event(void)
} }
} }
void set_sleep_timer(int seconds) void set_sleeptimer_duration(int minutes)
{
set_sleep_timer(minutes * 60);
}
static void set_sleep_timer(int seconds)
{ {
if (seconds) { if (seconds) {
sleeptimer_active = true; sleeptimer_active = true;