summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-02-07 04:24:21 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-02-07 04:24:21 +0000
commiteed62f1657f4f2b08571f0bd2b1827f3a71dac87 (patch)
tree1023d721c59e29150f445bbba25a0e11bed4c1ae /apps/settings.c
parentff3bb3aa18e71860d644a50632088ec282968de4 (diff)
downloadrockbox-eed62f1657f4f2b08571f0bd2b1827f3a71dac87.zip
rockbox-eed62f1657f4f2b08571f0bd2b1827f3a71dac87.tar.gz
rockbox-eed62f1657f4f2b08571f0bd2b1827f3a71dac87.tar.bz2
rockbox-eed62f1657f4f2b08571f0bd2b1827f3a71dac87.tar.xz
Change the radio screen and recording screen to use the global_status structure for state. I guess global_status had been added already and I missed it. :D
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12222 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/apps/settings.c b/apps/settings.c
index f0833a6..4d06f9b 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -73,7 +73,20 @@
void dac_line_in(bool enable);
#endif
struct user_settings global_settings;
-struct system_status global_status;
+
+/* Initial values for globally needed state data that shouldn't be saved
+ or reset should be defined here and not in settings_list */
+struct system_status global_status =
+{
+#ifdef CONFIG_TUNER
+ .in_radio_screen = false,
+ .radio_status = FMRADIO_OFF,
+#endif
+#ifdef HAVE_RECORDING
+ .in_recording_screen = false,
+#endif
+};
+
#ifdef HAVE_RECORDING
const char rec_base_directory[] = REC_BASE_DIR;
#endif