From 0c4f89370d05056faa789aa9cabcccc4e509fb9f Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 19 Jul 2020 19:38:45 -0400 Subject: [2/4] get rid of HAVE_LCD_CHARCELLS HAVE_LCD_BITMAP is now redundant. lcd_bitmap is always-on in features.txt so manual and lang strings don't have to change Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794 --- apps/gui/statusbar.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'apps/gui/statusbar.c') diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 30dad95509..90d04a7930 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c @@ -191,12 +191,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi if (!display) return; -#ifdef HAVE_LCD_CHARCELLS - int val; - (void)force_redraw; /* The Player always has "redraw" */ - (void)vp; -#endif /* HAVE_LCD_CHARCELLS */ - bar->info.battlevel = battery_level(); #ifdef HAVE_USB_POWER bar->info.usb_inserted = usb_inserted(); @@ -359,38 +353,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi } #endif /* HAVE_LCD_BITMAP */ - -#ifdef HAVE_LCD_CHARCELLS - display->icon(ICON_BATTERY, bar->info.battery_state); - - if (bar->info.batt_charge_step > -1) - val = bar->info.batt_charge_step; - else - val = (bar->info.battlevel * 3 + 50) / 100; - display->icon(ICON_BATTERY_1, val >= 1); - display->icon(ICON_BATTERY_2, val >= 2); - display->icon(ICON_BATTERY_3, val >= 3); - - val = 10 * (bar->info.volume - sound_min(SOUND_VOLUME)) - / (sound_max(SOUND_VOLUME) - sound_min(SOUND_VOLUME)); - display->icon(ICON_VOLUME, true); - display->icon(ICON_VOLUME_1, val >= 1); - display->icon(ICON_VOLUME_2, val >= 3); - display->icon(ICON_VOLUME_3, val >= 5); - display->icon(ICON_VOLUME_4, val >= 7); - display->icon(ICON_VOLUME_5, val >= 9); - - display->icon(ICON_PLAY, current_playmode() == STATUS_PLAY); - display->icon(ICON_PAUSE, current_playmode() == STATUS_PAUSE); - - display->icon(ICON_REPEAT, global_settings.repeat_mode != REPEAT_OFF); - display->icon(ICON_1, global_settings.repeat_mode == REPEAT_ONE); - - display->icon(ICON_RECORD, record); - display->icon(ICON_AUDIO, audio); - display->icon(ICON_PARAM, param); - display->icon(ICON_USB, usb); -#endif /* HAVE_LCD_CHARCELLS */ } #ifdef HAVE_LCD_BITMAP -- cgit v1.2.3