summaryrefslogtreecommitdiff
path: root/apps/gui/gwps-common.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui/gwps-common.c')
-rw-r--r--apps/gui/gwps-common.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index b90c216f58..f5ef604498 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -83,7 +83,7 @@ static void gui_wps_statusbar_draw(struct gui_wps *wps, bool force)
83 83
84/* fades the volume */ 84/* fades the volume */
85bool wps_fading_out = false; 85bool wps_fading_out = false;
86void fade(bool fade_in) 86void fade(bool fade_in, bool updatewps)
87{ 87{
88 int fp_global_vol = global_settings.volume << 8; 88 int fp_global_vol = global_settings.volume << 8;
89 int fp_min_vol = sound_min(SOUND_VOLUME) << 8; 89 int fp_min_vol = sound_min(SOUND_VOLUME) << 8;
@@ -103,8 +103,9 @@ void fade(bool fade_in)
103 while (fp_volume < fp_global_vol - fp_step) { 103 while (fp_volume < fp_global_vol - fp_step) {
104 fp_volume += fp_step; 104 fp_volume += fp_step;
105 sound_set_volume(fp_volume >> 8); 105 sound_set_volume(fp_volume >> 8);
106 FOR_NB_SCREENS(i) 106 if (updatewps)
107 gui_wps_refresh(&gui_wps[i], 0, WPS_REFRESH_NON_STATIC); 107 FOR_NB_SCREENS(i)
108 gui_wps_refresh(&gui_wps[i], 0, WPS_REFRESH_NON_STATIC);
108 sleep(1); 109 sleep(1);
109 } 110 }
110 sound_set_volume(global_settings.volume); 111 sound_set_volume(global_settings.volume);
@@ -116,8 +117,9 @@ void fade(bool fade_in)
116 while (fp_volume > fp_min_vol + fp_step) { 117 while (fp_volume > fp_min_vol + fp_step) {
117 fp_volume -= fp_step; 118 fp_volume -= fp_step;
118 sound_set_volume(fp_volume >> 8); 119 sound_set_volume(fp_volume >> 8);
119 FOR_NB_SCREENS(i) 120 if (updatewps)
120 gui_wps_refresh(&gui_wps[i], 0, WPS_REFRESH_NON_STATIC); 121 FOR_NB_SCREENS(i)
122 gui_wps_refresh(&gui_wps[i], 0, WPS_REFRESH_NON_STATIC);
121 sleep(1); 123 sleep(1);
122 } 124 }
123 audio_pause(); 125 audio_pause();