1
0
Fork 0
forked from len0rd/rockbox

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
This commit is contained in:
Michael Sevakis 2007-02-08 10:36:49 +00:00
parent fe3cfcc9b2
commit 0f17532c9d
9 changed files with 47 additions and 53 deletions

View file

@ -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 **/