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

1 files changed, 14 insertions, 0 deletions

diff --git a/apps/settings_list.c b/apps/settings_list.c
index c01584f8e2..ac410d57ca 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1113,6 +1113,20 @@ const struct settings_list settings[] = {
             ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS)
             ),
     SYSTEM_SETTING(NVRAM(1),last_screen,-1),
+#if defined(HAVE_RTC_ALARM) && \
+    (defined(HAVE_RECORDING) || CONFIG_TUNER)
+    CHOICE_SETTING(0, alarm_wake_up_screen, LANG_ALARM_WAKEUP_SCREEN, 
+            ALARM_START_WPS,
+            "alarm wakeup screen", ALARM_SETTING_TEXT, 
+            NULL, ALARM_START_COUNT, ID2P(LANG_RESUME_PLAYBACK)
+#if CONFIG_TUNER
+            ,ID2P(LANG_FM_RADIO)
+#endif
+#ifdef HAVE_RECORDING
+            ,ID2P(LANG_RECORDING)
+#endif
+            ),
+#endif /* HAVE_RTC_ALARM */
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);