Quicker fade_on_stop.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29558 a1c6a512-1295-4272-9138-f99709370657

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)
 {
     int fp_global_vol = global_settings.volume << 8;
     int fp_min_vol = sound_min(SOUND_VOLUME) << 8;
-    int fp_step = (fp_global_vol - fp_min_vol) / 30;
+    int fp_step = (fp_global_vol - fp_min_vol) / 10;
     int i;
     skin_get_global_state()->is_fading = !fade_in;
     if (fade_in) {
@@ -136,14 +136,14 @@ void fade(bool fade_in, bool updatewps)
         sleep(HZ/10); /* let audio thread run */
         audio_resume();
         
+        if (updatewps) {
+            FOR_NB_SCREENS(i)
+                skin_update(WPS, i, SKIN_REFRESH_NON_STATIC);
+        }
+
         while (fp_volume < fp_global_vol - fp_step) {
             fp_volume += fp_step;
             sound_set_volume(fp_volume >> 8);
-            if (updatewps)
-            {
-                FOR_NB_SCREENS(i)
-                    skin_update(WPS, i, SKIN_REFRESH_NON_STATIC);
-            }
             sleep(1);
         }
         sound_set_volume(global_settings.volume);
@@ -152,17 +152,18 @@ void fade(bool fade_in, bool updatewps)
         /* fade out */
         int fp_volume = fp_global_vol;
 
+        if (updatewps) {
+            FOR_NB_SCREENS(i)
+                skin_update(WPS, i, SKIN_REFRESH_NON_STATIC);
+        }
+
         while (fp_volume > fp_min_vol + fp_step) {
             fp_volume -= fp_step;
             sound_set_volume(fp_volume >> 8);
-            if (updatewps)
-            {
-                FOR_NB_SCREENS(i)
-                    skin_update(WPS, i, SKIN_REFRESH_NON_STATIC);
-            }
             sleep(1);
         }
         audio_pause();
+
         skin_get_global_state()->is_fading = false;
 #if CONFIG_CODEC != SWCODEC
 #ifndef SIMULATOR