diff options
| author | Thomas Jarosch <tomj@simonv.com> | 2011-03-10 15:50:15 +0000 |
|---|---|---|
| committer | Thomas Jarosch <tomj@simonv.com> | 2011-03-10 15:50:15 +0000 |
| commit | 98cf1a14b04590005ea6c2bb46e98c06fb47f375 (patch) | |
| tree | aa6b7e61f4d63864c6af517e5c5d8e5edc391f1f /firmware/powermgmt.c | |
| parent | 36d98fa7d04ce503a67dae71504a9e24c994c896 (diff) | |
| download | rockbox-98cf1a14b04590005ea6c2bb46e98c06fb47f375.tar.gz rockbox-98cf1a14b04590005ea6c2bb46e98c06fb47f375.tar.bz2 rockbox-98cf1a14b04590005ea6c2bb46e98c06fb47f375.zip | |
Don't call apps/ code from firmware/
Replace audio_stop() with audio_pause() in the sleep timer handler
for the connected charger case and remove recently added bookmarking code.
We don't power down anyway and a paused playback state
is still eligible for automatic bookmark creation if the
user later on removes the charger and waits for idle poweroff.
Hopefully other devs can sleep at night now. Or maybe I should leave
that change in there so they stay awake and hack on rockbox...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29555 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/powermgmt.c')
| -rw-r--r-- | firmware/powermgmt.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index d9014dc047..46d9938f0b 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -47,9 +47,6 @@ #if (CONFIG_PLATFORM & PLATFORM_HOSTED) #include <time.h> #endif -#ifndef BOOTLOADER -#include "bookmark.h" -#endif #if (defined(IAUDIO_X5) || defined(IAUDIO_M5)) && !defined (SIMULATOR) #include "lcd-remote-target.h" @@ -803,10 +800,7 @@ static void handle_sleep_timer(void) #endif ) { DEBUGF("Sleep timer timeout. Stopping...\n"); -#ifndef BOOTLOADER - bookmark_autobookmark(false); -#endif - audio_stop(); + audio_pause(); set_sleep_timer(0); backlight_off(); /* Nighty, nighty... */ } |