diff options
author | Jerome Kuptz <jeromekuptz@gmail.com> | 2002-06-25 08:40:53 +0000 |
---|---|---|
committer | Jerome Kuptz <jeromekuptz@gmail.com> | 2002-06-25 08:40:53 +0000 |
commit | 6fd0a531f6605c9419b6c6e15a1d68217b12befb (patch) | |
tree | 30a1f4fdfe890471cce0ca83c150b61dce25a39a | |
parent | d5dda2c360536367c7b51b74d7f44e710c08bdc6 (diff) | |
download | rockbox-6fd0a531f6605c9419b6c6e15a1d68217b12befb.tar.gz rockbox-6fd0a531f6605c9419b6c6e15a1d68217b12befb.zip |
Added the wps_display to global settings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1167 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/settings.c | 20 | ||||
-rw-r--r-- | firmware/settings.h | 6 |
2 files changed, 16 insertions, 10 deletions
diff --git a/firmware/settings.c b/firmware/settings.c index da69a9d254..6d22419dfe 100644 --- a/firmware/settings.c +++ b/firmware/settings.c | |||
@@ -63,17 +63,19 @@ void reset_settings( user_settings_t *settings ) { | |||
63 | 63 | ||
64 | DEBUGF( "reset_settings()\n" ); | 64 | DEBUGF( "reset_settings()\n" ); |
65 | 65 | ||
66 | settings->volume = DEFAULT_VOLUME_SETTING; | 66 | settings->volume = DEFAULT_VOLUME_SETTING; |
67 | settings->balance = DEFAULT_BALANCE_SETTING; | 67 | settings->balance = DEFAULT_BALANCE_SETTING; |
68 | settings->bass = DEFAULT_BASS_SETTING; | 68 | settings->bass = DEFAULT_BASS_SETTING; |
69 | settings->treble = DEFAULT_TREBLE_SETTING; | 69 | settings->treble = DEFAULT_TREBLE_SETTING; |
70 | settings->loudness = DEFAULT_LOUDNESS_SETTING; | 70 | settings->loudness = DEFAULT_LOUDNESS_SETTING; |
71 | settings->bass_boost = DEFAULT_BASS_BOOST_SETTING; | 71 | settings->bass_boost = DEFAULT_BASS_BOOST_SETTING; |
72 | settings->contrast = DEFAULT_CONTRAST_SETTING; | 72 | settings->contrast = DEFAULT_CONTRAST_SETTING; |
73 | settings->poweroff = DEFAULT_POWEROFF_SETTING; | 73 | settings->poweroff = DEFAULT_POWEROFF_SETTING; |
74 | settings->backlight = DEFAULT_BACKLIGHT_SETTING; | 74 | settings->backlight = DEFAULT_BACKLIGHT_SETTING; |
75 | settings->wps_display = DEFAULT_WPS_DISPLAY; | ||
75 | } | 76 | } |
76 | 77 | ||
78 | |||
77 | /* | 79 | /* |
78 | * dump the list of current settings | 80 | * dump the list of current settings |
79 | */ | 81 | */ |
diff --git a/firmware/settings.h b/firmware/settings.h index 2c03786f35..723c694699 100644 --- a/firmware/settings.h +++ b/firmware/settings.h | |||
@@ -55,6 +55,10 @@ typedef struct | |||
55 | 55 | ||
56 | int loop_playlist; /* do we return to top of playlist at end? */ | 56 | int loop_playlist; /* do we return to top of playlist at end? */ |
57 | 57 | ||
58 | |||
59 | /* while playing screen settings */ | ||
60 | int wps_display; | ||
61 | |||
58 | } user_settings_t; | 62 | } user_settings_t; |
59 | 63 | ||
60 | /* prototypes */ | 64 | /* prototypes */ |
@@ -78,6 +82,6 @@ extern user_settings_t global_settings; | |||
78 | #define DEFAULT_CONTRAST_SETTING 0 | 82 | #define DEFAULT_CONTRAST_SETTING 0 |
79 | #define DEFAULT_POWEROFF_SETTING 0 | 83 | #define DEFAULT_POWEROFF_SETTING 0 |
80 | #define DEFAULT_BACKLIGHT_SETTING 5 | 84 | #define DEFAULT_BACKLIGHT_SETTING 5 |
81 | 85 | #define DEFAULT_WPS_DISPLAY 0 | |
82 | 86 | ||
83 | #endif /* __SETTINGS_H__ */ | 87 | #endif /* __SETTINGS_H__ */ |