diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/wps.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index b97f6bcf51..a522a08101 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -123,7 +123,7 @@ void fade(bool fade_in, bool updatewps) | |||
123 | { | 123 | { |
124 | int fp_global_vol = global_settings.volume << 8; | 124 | int fp_global_vol = global_settings.volume << 8; |
125 | int fp_min_vol = sound_min(SOUND_VOLUME) << 8; | 125 | int fp_min_vol = sound_min(SOUND_VOLUME) << 8; |
126 | int fp_step = (fp_global_vol - fp_min_vol) / 30; | 126 | int fp_step = (fp_global_vol - fp_min_vol) / 10; |
127 | int i; | 127 | int i; |
128 | skin_get_global_state()->is_fading = !fade_in; | 128 | skin_get_global_state()->is_fading = !fade_in; |
129 | if (fade_in) { | 129 | if (fade_in) { |
@@ -136,14 +136,14 @@ void fade(bool fade_in, bool updatewps) | |||
136 | sleep(HZ/10); /* let audio thread run */ | 136 | sleep(HZ/10); /* let audio thread run */ |
137 | audio_resume(); | 137 | audio_resume(); |
138 | 138 | ||
139 | if (updatewps) { | ||
140 | FOR_NB_SCREENS(i) | ||
141 | skin_update(WPS, i, SKIN_REFRESH_NON_STATIC); | ||
142 | } | ||
143 | |||
139 | while (fp_volume < fp_global_vol - fp_step) { | 144 | while (fp_volume < fp_global_vol - fp_step) { |
140 | fp_volume += fp_step; | 145 | fp_volume += fp_step; |
141 | sound_set_volume(fp_volume >> 8); | 146 | sound_set_volume(fp_volume >> 8); |
142 | if (updatewps) | ||
143 | { | ||
144 | FOR_NB_SCREENS(i) | ||
145 | skin_update(WPS, i, SKIN_REFRESH_NON_STATIC); | ||
146 | } | ||
147 | sleep(1); | 147 | sleep(1); |
148 | } | 148 | } |
149 | sound_set_volume(global_settings.volume); | 149 | sound_set_volume(global_settings.volume); |
@@ -152,17 +152,18 @@ void fade(bool fade_in, bool updatewps) | |||
152 | /* fade out */ | 152 | /* fade out */ |
153 | int fp_volume = fp_global_vol; | 153 | int fp_volume = fp_global_vol; |
154 | 154 | ||
155 | if (updatewps) { | ||
156 | FOR_NB_SCREENS(i) | ||
157 | skin_update(WPS, i, SKIN_REFRESH_NON_STATIC); | ||
158 | } | ||
159 | |||
155 | while (fp_volume > fp_min_vol + fp_step) { | 160 | while (fp_volume > fp_min_vol + fp_step) { |
156 | fp_volume -= fp_step; | 161 | fp_volume -= fp_step; |
157 | sound_set_volume(fp_volume >> 8); | 162 | sound_set_volume(fp_volume >> 8); |
158 | if (updatewps) | ||
159 | { | ||
160 | FOR_NB_SCREENS(i) | ||
161 | skin_update(WPS, i, SKIN_REFRESH_NON_STATIC); | ||
162 | } | ||
163 | sleep(1); | 163 | sleep(1); |
164 | } | 164 | } |
165 | audio_pause(); | 165 | audio_pause(); |
166 | |||
166 | skin_get_global_state()->is_fading = false; | 167 | skin_get_global_state()->is_fading = false; |
167 | #if CONFIG_CODEC != SWCODEC | 168 | #if CONFIG_CODEC != SWCODEC |
168 | #ifndef SIMULATOR | 169 | #ifndef SIMULATOR |