diff options
Diffstat (limited to 'apps/gui/gwps.c')
-rw-r--r-- | apps/gui/gwps.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 1d8d7255bf..7ba9862895 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -115,24 +115,25 @@ static void next_track(void) | |||
115 | 115 | ||
116 | audio_next(); | 116 | audio_next(); |
117 | } | 117 | } |
118 | static char fix_wps_bars(void) | 118 | static int fix_wps_bars(void) |
119 | { | 119 | { |
120 | #ifdef HAVE_LCD_BITMAP | 120 | #ifdef HAVE_LCD_BITMAP |
121 | int i; | 121 | int i; |
122 | char wpsbars = 0; | 122 | int wpsbars = VP_SB_HIDE_ALL; |
123 | FOR_NB_SCREENS(i) | 123 | FOR_NB_SCREENS(i) |
124 | { | 124 | { |
125 | bool draw = global_settings.statusbar; | 125 | bool draw = global_settings.statusbar; |
126 | if (gui_wps[i].data->wps_sb_tag) | 126 | if (gui_wps[i].data->wps_sb_tag) |
127 | draw = gui_wps[i].data->show_sb_on_wps; | 127 | draw = gui_wps[i].data->show_sb_on_wps; |
128 | if (draw) | 128 | if (draw) |
129 | wpsbars |= VP_IGNORE_SB_SETTING(i)|(1<<i); | 129 | wpsbars |= (VP_SB_ONSCREEN(i) | VP_SB_IGNORE_SETTING(i)); |
130 | } | 130 | } |
131 | return wpsbars; | 131 | return wpsbars; |
132 | #else | 132 | #else |
133 | return 1; | 133 | return VP_SB_ALLSCREENS; |
134 | #endif | 134 | #endif |
135 | } | 135 | } |
136 | |||
136 | long gui_wps_show(void) | 137 | long gui_wps_show(void) |
137 | { | 138 | { |
138 | long button = 0; | 139 | long button = 0; |
@@ -143,7 +144,7 @@ long gui_wps_show(void) | |||
143 | bool update_track = false; | 144 | bool update_track = false; |
144 | int i; | 145 | int i; |
145 | long last_left = 0, last_right = 0; | 146 | long last_left = 0, last_right = 0; |
146 | char wpsbars = 0, oldbars = 0; | 147 | int wpsbars, oldbars; |
147 | 148 | ||
148 | wps_state_init(); | 149 | wps_state_init(); |
149 | 150 | ||
@@ -165,7 +166,7 @@ long gui_wps_show(void) | |||
165 | ab_reset_markers(); | 166 | ab_reset_markers(); |
166 | #endif | 167 | #endif |
167 | 168 | ||
168 | oldbars = viewportmanager_set_statusbar(0); | 169 | oldbars = viewportmanager_set_statusbar(VP_SB_HIDE_ALL); |
169 | if(audio_status() & AUDIO_STATUS_PLAY) | 170 | if(audio_status() & AUDIO_STATUS_PLAY) |
170 | { | 171 | { |
171 | wps_state.id3 = audio_current_track(); | 172 | wps_state.id3 = audio_current_track(); |