diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2007-02-08 10:36:49 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2007-02-08 10:36:49 +0000 |
| commit | 0f17532c9ddb2282c385ce6ad501a2e5d94acbe5 (patch) | |
| tree | 02df2cb3f274e9106c21abf1926441bd7f3429c3 /apps/settings.c | |
| parent | fe3cfcc9b2b0ce5f0862f891762794ddf42bb6ab (diff) | |
| download | rockbox-0f17532c9ddb2282c385ce6ad501a2e5d94acbe5.zip rockbox-0f17532c9ddb2282c385ce6ad501a2e5d94acbe5.tar.gz rockbox-0f17532c9ddb2282c385ce6ad501a2e5d94acbe5.tar.bz2 rockbox-0f17532c9ddb2282c385ce6ad501a2e5d94acbe5.tar.xz | |
Revert the changes using global status for the screen states. It should wait for a more comprehensive plan to maximize benefit if any can be had.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12231 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
| -rw-r--r-- | apps/settings.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/apps/settings.c b/apps/settings.c index 42a66ac..8c92b84 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -74,21 +74,7 @@ void dac_line_in(bool enable); #endif struct user_settings global_settings; - -/* 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 = -{ - .runtime = 0, /* this will be overwritten when nvram settings are loaded */ -#ifdef CONFIG_TUNER - .in_radio_screen = false, - .radio_status = FMRADIO_OFF, -#endif -#ifdef HAVE_RECORDING - .in_recording_screen = false, -#endif -}; +struct system_status global_status; #ifdef HAVE_RECORDING const char rec_base_directory[] = REC_BASE_DIR; @@ -919,9 +905,6 @@ void settings_reset(void) { #if defined (HAVE_RECORDING) && CONFIG_CODEC == SWCODEC enc_global_settings_reset(); #endif -#ifdef HAVE_RECORDING - global_status.in_recording_screen = false; -#endif } /** Changing setting values **/ |