diff options
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/apps/screens.c b/apps/screens.c index 29888ff358..00106df8ba 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -167,6 +167,8 @@ bool f2_screen(void) | |||
167 | lcd_stop_scroll(); | 167 | lcd_stop_scroll(); |
168 | 168 | ||
169 | while (!exit) { | 169 | while (!exit) { |
170 | char* ptr=NULL; | ||
171 | |||
170 | lcd_clear_display(); | 172 | lcd_clear_display(); |
171 | 173 | ||
172 | lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_SHUFFLE)); | 174 | lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_SHUFFLE)); |
@@ -177,12 +179,25 @@ bool f2_screen(void) | |||
177 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], | 179 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], |
178 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); | 180 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); |
179 | 181 | ||
180 | snprintf(buf, sizeof buf, str(LANG_DIR_FILTER), | 182 | switch ( global_settings.dirfilter ) { |
181 | global_settings.mp3filter ? str(LANG_ON) : str(LANG_OFF)); | 183 | case SHOW_ALL: |
184 | ptr = str(LANG_FILTER_ALL); | ||
185 | break; | ||
186 | |||
187 | case SHOW_SUPPORTED: | ||
188 | ptr = str(LANG_FILTER_SUPPORTED); | ||
189 | break; | ||
190 | |||
191 | case SHOW_MUSIC: | ||
192 | ptr = str(LANG_FILTER_MUSIC); | ||
193 | break; | ||
194 | } | ||
182 | 195 | ||
183 | /* Get the string width and height */ | 196 | snprintf(buf, sizeof buf, "%s:", str(LANG_FILTER)); |
184 | lcd_getstringsize(buf,&w,&h); | 197 | lcd_getstringsize(buf,&w,&h); |
185 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, buf); | 198 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, buf); |
199 | lcd_getstringsize(ptr,&w,&h); | ||
200 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); | ||
186 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], | 201 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], |
187 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); | 202 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); |
188 | 203 | ||
@@ -203,7 +218,9 @@ bool f2_screen(void) | |||
203 | 218 | ||
204 | case BUTTON_DOWN: | 219 | case BUTTON_DOWN: |
205 | case BUTTON_F2 | BUTTON_DOWN: | 220 | case BUTTON_F2 | BUTTON_DOWN: |
206 | global_settings.mp3filter = !global_settings.mp3filter; | 221 | global_settings.dirfilter++; |
222 | if ( global_settings.dirfilter >= NUM_FILTER_MODES ) | ||
223 | global_settings.dirfilter = 0; | ||
207 | used = true; | 224 | used = true; |
208 | break; | 225 | break; |
209 | 226 | ||