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/settings.h | |
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/settings.h')
-rw-r--r-- | apps/settings.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/apps/settings.h b/apps/settings.h index 6e2db093d9..f9e08152af 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -166,7 +166,26 @@ enum { REPLAYGAIN_TRACK = 0, REPLAYGAIN_ALBUM, REPLAYGAIN_SHUFFLE }; | |||
166 | /* show path types */ | 166 | /* show path types */ |
167 | enum { SHOW_PATH_OFF = 0, SHOW_PATH_CURRENT, SHOW_PATH_FULL }; | 167 | enum { SHOW_PATH_OFF = 0, SHOW_PATH_CURRENT, SHOW_PATH_FULL }; |
168 | 168 | ||
169 | /* Alarm settings */ | ||
170 | #ifdef HAVE_RTC_ALARM | ||
171 | enum { ALARM_START_WPS = 0, | ||
172 | #if CONFIG_TUNER | ||
173 | ALARM_START_FM, | ||
174 | #endif | ||
175 | #ifdef HAVE_RECORDING | ||
176 | ALARM_START_REC, | ||
177 | #endif | ||
178 | ALARM_START_COUNT | ||
179 | }; | ||
180 | #if CONFIG_TUNER && defined(HAVE_RECORDING) | ||
181 | #define ALARM_SETTING_TEXT "wps,fm,rec" | ||
182 | #elif CONFIG_TUNER | ||
183 | #define ALARM_SETTING_TEXT "wps,fm" | ||
184 | #elif defined(HAVE_RECORDING) | ||
185 | #define ALARM_SETTING_TEXT "wps,rec" | ||
186 | #endif | ||
169 | 187 | ||
188 | #endif /* HAVE_RTC_ALARM */ | ||
170 | /** virtual pointer stuff.. move to another .h maybe? **/ | 189 | /** virtual pointer stuff.. move to another .h maybe? **/ |
171 | /* These define "virtual pointers", which could either be a literal string, | 190 | /* These define "virtual pointers", which could either be a literal string, |
172 | or a mean a string ID if the pointer is in a certain range. | 191 | or a mean a string ID if the pointer is in a certain range. |
@@ -681,6 +700,11 @@ struct user_settings | |||
681 | #endif /* CONFIG_CODEC == SWCODEC */ | 700 | #endif /* CONFIG_CODEC == SWCODEC */ |
682 | bool cuesheet; | 701 | bool cuesheet; |
683 | int start_in_screen; | 702 | int start_in_screen; |
703 | #if defined(HAVE_RTC_ALARM) && \ | ||
704 | (defined(HAVE_RECORDING) || CONFIG_TUNER) | ||
705 | int alarm_wake_up_screen; | ||
706 | #endif | ||
707 | |||
684 | }; | 708 | }; |
685 | 709 | ||
686 | /** global variables **/ | 710 | /** global variables **/ |