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/gui/skin_engine/skin_tokens.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/gui/skin_engine/skin_tokens.c')
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 2528a0af55..db9a9e694b 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -41,11 +41,9 @@ | |||
41 | #include "lang.h" | 41 | #include "lang.h" |
42 | #include "misc.h" | 42 | #include "misc.h" |
43 | #include "led.h" | 43 | #include "led.h" |
44 | #ifdef HAVE_LCD_BITMAP | ||
45 | #include "peakmeter.h" | 44 | #include "peakmeter.h" |
46 | /* Image stuff */ | 45 | /* Image stuff */ |
47 | #include "albumart.h" | 46 | #include "albumart.h" |
48 | #endif | ||
49 | #include "playlist.h" | 47 | #include "playlist.h" |
50 | #include "playback.h" | 48 | #include "playback.h" |
51 | #include "tdspeed.h" | 49 | #include "tdspeed.h" |
@@ -813,7 +811,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
813 | if (intval) | 811 | if (intval) |
814 | *intval = playlist_amount(); | 812 | *intval = playlist_amount(); |
815 | return buf; | 813 | return buf; |
816 | #ifdef HAVE_LCD_BITMAP | ||
817 | case SKIN_TOKEN_LIST_TITLE_TEXT: | 814 | case SKIN_TOKEN_LIST_TITLE_TEXT: |
818 | return sb_get_title(gwps->display->screen_type); | 815 | return sb_get_title(gwps->display->screen_type); |
819 | case SKIN_TOKEN_LIST_TITLE_ICON: | 816 | case SKIN_TOKEN_LIST_TITLE_ICON: |
@@ -854,7 +851,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
854 | } | 851 | } |
855 | case SKIN_TOKEN_LIST_NEEDS_SCROLLBAR: | 852 | case SKIN_TOKEN_LIST_NEEDS_SCROLLBAR: |
856 | return skinlist_needs_scrollbar(gwps->display->screen_type) ? "s" : ""; | 853 | return skinlist_needs_scrollbar(gwps->display->screen_type) ? "s" : ""; |
857 | #endif | ||
858 | case SKIN_TOKEN_PLAYLIST_NAME: | 854 | case SKIN_TOKEN_PLAYLIST_NAME: |
859 | return playlist_name(NULL, buf, buf_size); | 855 | return playlist_name(NULL, buf, buf_size); |
860 | 856 | ||
@@ -1202,7 +1198,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1202 | return "-"; | 1198 | return "-"; |
1203 | #endif | 1199 | #endif |
1204 | 1200 | ||
1205 | #ifdef HAVE_LCD_BITMAP | ||
1206 | /* peakmeter */ | 1201 | /* peakmeter */ |
1207 | case SKIN_TOKEN_PEAKMETER_LEFT: | 1202 | case SKIN_TOKEN_PEAKMETER_LEFT: |
1208 | case SKIN_TOKEN_PEAKMETER_RIGHT: | 1203 | case SKIN_TOKEN_PEAKMETER_RIGHT: |
@@ -1218,7 +1213,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1218 | data->peak_meter_enabled = true; | 1213 | data->peak_meter_enabled = true; |
1219 | return buf; | 1214 | return buf; |
1220 | } | 1215 | } |
1221 | #endif | ||
1222 | 1216 | ||
1223 | case SKIN_TOKEN_CROSSFADE: | 1217 | case SKIN_TOKEN_CROSSFADE: |
1224 | #ifdef HAVE_CROSSFADE | 1218 | #ifdef HAVE_CROSSFADE |