From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 17 Jul 2020 10:31:31 -0400 Subject: [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 --- apps/gui/skin_engine/skin_tokens.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'apps/gui/skin_engine/skin_tokens.c') 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 @@ #include "lang.h" #include "misc.h" #include "led.h" -#ifdef HAVE_LCD_BITMAP #include "peakmeter.h" /* Image stuff */ #include "albumart.h" -#endif #include "playlist.h" #include "playback.h" #include "tdspeed.h" @@ -813,7 +811,6 @@ const char *get_token_value(struct gui_wps *gwps, if (intval) *intval = playlist_amount(); return buf; -#ifdef HAVE_LCD_BITMAP case SKIN_TOKEN_LIST_TITLE_TEXT: return sb_get_title(gwps->display->screen_type); case SKIN_TOKEN_LIST_TITLE_ICON: @@ -854,7 +851,6 @@ const char *get_token_value(struct gui_wps *gwps, } case SKIN_TOKEN_LIST_NEEDS_SCROLLBAR: return skinlist_needs_scrollbar(gwps->display->screen_type) ? "s" : ""; -#endif case SKIN_TOKEN_PLAYLIST_NAME: return playlist_name(NULL, buf, buf_size); @@ -1202,7 +1198,6 @@ const char *get_token_value(struct gui_wps *gwps, return "-"; #endif -#ifdef HAVE_LCD_BITMAP /* peakmeter */ case SKIN_TOKEN_PEAKMETER_LEFT: case SKIN_TOKEN_PEAKMETER_RIGHT: @@ -1218,7 +1213,6 @@ const char *get_token_value(struct gui_wps *gwps, data->peak_meter_enabled = true; return buf; } -#endif case SKIN_TOKEN_CROSSFADE: #ifdef HAVE_CROSSFADE -- cgit v1.2.3