diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/filetree.c | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'apps/filetree.c')
-rw-r--r-- | apps/filetree.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index e45348dc18..d645b7225c 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -44,9 +44,7 @@ | |||
44 | #include "filetree.h" | 44 | #include "filetree.h" |
45 | #include "misc.h" | 45 | #include "misc.h" |
46 | #include "strnatcmp.h" | 46 | #include "strnatcmp.h" |
47 | #ifdef HAVE_LCD_BITMAP | ||
48 | #include "keyboard.h" | 47 | #include "keyboard.h" |
49 | #endif | ||
50 | 48 | ||
51 | #if CONFIG_TUNER | 49 | #if CONFIG_TUNER |
52 | #include "radio.h" | 50 | #include "radio.h" |
@@ -339,13 +337,11 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
339 | (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_M3U) || | 337 | (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_M3U) || |
340 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || | 338 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || |
341 | (*c->dirfilter == SHOW_WPS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_WPS) || | 339 | (*c->dirfilter == SHOW_WPS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_WPS) || |
342 | #ifdef HAVE_LCD_BITMAP | ||
343 | (*c->dirfilter == SHOW_FONT && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_FONT) || | 340 | (*c->dirfilter == SHOW_FONT && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_FONT) || |
344 | (*c->dirfilter == SHOW_SBS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_SBS) || | 341 | (*c->dirfilter == SHOW_SBS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_SBS) || |
345 | #if CONFIG_TUNER | 342 | #if CONFIG_TUNER |
346 | (*c->dirfilter == SHOW_FMS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_FMS) || | 343 | (*c->dirfilter == SHOW_FMS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_FMS) || |
347 | #endif | 344 | #endif |
348 | #endif | ||
349 | #ifdef HAVE_REMOTE_LCD | 345 | #ifdef HAVE_REMOTE_LCD |
350 | (*c->dirfilter == SHOW_RWPS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_RWPS) || | 346 | (*c->dirfilter == SHOW_RWPS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_RWPS) || |
351 | (*c->dirfilter == SHOW_RSBS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_RSBS) || | 347 | (*c->dirfilter == SHOW_RSBS && (dptr->attr & FILE_ATTR_MASK) != FILE_ATTR_RSBS) || |
@@ -399,7 +395,6 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
399 | tree_unlock_cache(c); | 395 | tree_unlock_cache(c); |
400 | return 0; | 396 | return 0; |
401 | } | 397 | } |
402 | #ifdef HAVE_LCD_BITMAP | ||
403 | static void ft_load_font(char *file) | 398 | static void ft_load_font(char *file) |
404 | { | 399 | { |
405 | int current_font_id; | 400 | int current_font_id; |
@@ -428,8 +423,7 @@ static void ft_load_font(char *file) | |||
428 | screens[screen].setuifont( | 423 | screens[screen].setuifont( |
429 | font_load_ex(file,0,global_settings.glyphs_to_cache)); | 424 | font_load_ex(file,0,global_settings.glyphs_to_cache)); |
430 | viewportmanager_theme_changed(THEME_UI_VIEWPORT); | 425 | viewportmanager_theme_changed(THEME_UI_VIEWPORT); |
431 | } | 426 | } |
432 | #endif | ||
433 | 427 | ||
434 | int ft_enter(struct tree_context* c) | 428 | int ft_enter(struct tree_context* c) |
435 | { | 429 | { |
@@ -550,13 +544,11 @@ int ft_enter(struct tree_context* c) | |||
550 | #endif | 544 | #endif |
551 | #endif | 545 | #endif |
552 | 546 | ||
553 | #ifdef HAVE_LCD_BITMAP | ||
554 | case FILE_ATTR_SBS: | 547 | case FILE_ATTR_SBS: |
555 | splash(0, ID2P(LANG_WAIT)); | 548 | splash(0, ID2P(LANG_WAIT)); |
556 | set_file(buf, (char *)global_settings.sbs_file, MAX_FILENAME); | 549 | set_file(buf, (char *)global_settings.sbs_file, MAX_FILENAME); |
557 | settings_apply_skins(); | 550 | settings_apply_skins(); |
558 | break; | 551 | break; |
559 | #endif | ||
560 | #ifdef HAVE_REMOTE_LCD | 552 | #ifdef HAVE_REMOTE_LCD |
561 | case FILE_ATTR_RSBS: | 553 | case FILE_ATTR_RSBS: |
562 | splash(0, ID2P(LANG_WAIT)); | 554 | splash(0, ID2P(LANG_WAIT)); |
@@ -610,7 +602,6 @@ int ft_enter(struct tree_context* c) | |||
610 | splash(HZ, ID2P(LANG_LANGUAGE_LOADED)); | 602 | splash(HZ, ID2P(LANG_LANGUAGE_LOADED)); |
611 | break; | 603 | break; |
612 | 604 | ||
613 | #ifdef HAVE_LCD_BITMAP | ||
614 | case FILE_ATTR_FONT: | 605 | case FILE_ATTR_FONT: |
615 | ft_load_font(buf); | 606 | ft_load_font(buf); |
616 | break; | 607 | break; |
@@ -621,7 +612,6 @@ int ft_enter(struct tree_context* c) | |||
621 | splash(HZ, ID2P(LANG_KEYBOARD_LOADED)); | 612 | splash(HZ, ID2P(LANG_KEYBOARD_LOADED)); |
622 | set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); | 613 | set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); |
623 | break; | 614 | break; |
624 | #endif | ||
625 | 615 | ||
626 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 616 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
627 | /* firmware file */ | 617 | /* firmware file */ |