diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-07 01:16:25 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-07 01:16:25 +0000 |
commit | 9e554a87fc79825b32d2de050734a52d5753049b (patch) | |
tree | 58c21c5d6dcfc52cf3b6bc6fb7b31e571e700326 /apps/menus/settings_menu.c | |
parent | f609c5bd3ef8b378394b920a001441ba01db04cf (diff) | |
download | rockbox-9e554a87fc79825b32d2de050734a52d5753049b.tar.gz rockbox-9e554a87fc79825b32d2de050734a52d5753049b.zip |
Fix alarm wake up. If the target has fm or recording (or both) an option is in the System menu to choose what to start when the alarm wakes up,
otherwise the WPS will start
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12654 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 690f9e62e4..b962f1fb52 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -211,6 +211,10 @@ MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | |||
211 | #ifdef HAVE_RTC_ALARM | 211 | #ifdef HAVE_RTC_ALARM |
212 | MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), | 212 | MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), |
213 | (menu_function)alarm_screen, NULL, Icon_NOICON); | 213 | (menu_function)alarm_screen, NULL, Icon_NOICON); |
214 | #if defined(HAVE_RECORDING) || CONFIG_TUNER | ||
215 | MENUITEM_SETTING(alarm_wake_up_screen, | ||
216 | &global_settings.alarm_wake_up_screen, NULL); | ||
217 | #endif | ||
214 | #endif | 218 | #endif |
215 | 219 | ||
216 | /* Limits menu */ | 220 | /* Limits menu */ |
@@ -256,6 +260,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
256 | &poweroff, | 260 | &poweroff, |
257 | #ifdef HAVE_RTC_ALARM | 261 | #ifdef HAVE_RTC_ALARM |
258 | &alarm_screen_call, | 262 | &alarm_screen_call, |
263 | #if defined(HAVE_RECORDING) || CONFIG_TUNER | ||
264 | &alarm_wake_up_screen, | ||
265 | #endif | ||
259 | #endif | 266 | #endif |
260 | &limits_menu, | 267 | &limits_menu, |
261 | #if CONFIG_CODEC == MAS3507D | 268 | #if CONFIG_CODEC == MAS3507D |