forked from len0rd/rockbox
Stop/shutdown logic rework in browsers and menus. Recorder V1: Double-Off shutdown is now possible from menus and sub-browsers as well. Player, other targets which are always powered during charging: Attempted shutdown from menu with charger plugged now displays the charging splash.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13079 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
dcb4aa242b
commit
178c565beb
6 changed files with 59 additions and 46 deletions
41
apps/tree.c
41
apps/tree.c
|
|
@ -665,43 +665,10 @@ static int dirbrowse()
|
|||
break;
|
||||
|
||||
case ACTION_TREE_STOP:
|
||||
if (*tc.dirfilter < NUM_FILTER_MODES)
|
||||
{
|
||||
/* Stop the music if it is playing */
|
||||
if(audio_status()) {
|
||||
if (!global_settings.party_mode) {
|
||||
if (global_settings.fade_on_stop)
|
||||
fade(0);
|
||||
bookmark_autobookmark();
|
||||
audio_stop();
|
||||
}
|
||||
}
|
||||
#if CONFIG_CHARGING && \
|
||||
(CONFIG_KEYPAD == RECORDER_PAD) && !defined(HAVE_SW_POWEROFF)
|
||||
else {
|
||||
if (!charger_inserted()) {
|
||||
if(shutdown_screen())
|
||||
reload_dir = true;
|
||||
} else {
|
||||
charging_splash();
|
||||
}
|
||||
restore = true;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
|
||||
{
|
||||
static int last_off = 0;
|
||||
if (current_tick - last_off < 50) {
|
||||
if (charger_inserted()) {
|
||||
charging_splash();
|
||||
restore = true;
|
||||
}
|
||||
}
|
||||
last_off = current_tick;
|
||||
}
|
||||
#endif
|
||||
break; /* case ACTION_TREE_STOP: */
|
||||
if (list_stop_handler())
|
||||
restore = true;
|
||||
break;
|
||||
|
||||
case ACTION_STD_MENU:
|
||||
return GO_TO_ROOT;
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue