diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-19 19:38:45 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (patch) | |
tree | 6ddf7fff0a47564db41d39927ea1acbdb03e74ee /apps/gui/statusbar.c | |
parent | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (diff) | |
download | rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.tar.gz rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.zip |
[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
Diffstat (limited to 'apps/gui/statusbar.c')
-rw-r--r-- | apps/gui/statusbar.c | 38 |
1 files changed, 0 insertions, 38 deletions
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 | |||
191 | if (!display) | 191 | if (!display) |
192 | return; | 192 | return; |
193 | 193 | ||
194 | #ifdef HAVE_LCD_CHARCELLS | ||
195 | int val; | ||
196 | (void)force_redraw; /* The Player always has "redraw" */ | ||
197 | (void)vp; | ||
198 | #endif /* HAVE_LCD_CHARCELLS */ | ||
199 | |||
200 | bar->info.battlevel = battery_level(); | 194 | bar->info.battlevel = battery_level(); |
201 | #ifdef HAVE_USB_POWER | 195 | #ifdef HAVE_USB_POWER |
202 | bar->info.usb_inserted = usb_inserted(); | 196 | bar->info.usb_inserted = usb_inserted(); |
@@ -359,38 +353,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi | |||
359 | } | 353 | } |
360 | #endif /* HAVE_LCD_BITMAP */ | 354 | #endif /* HAVE_LCD_BITMAP */ |
361 | 355 | ||
362 | |||
363 | #ifdef HAVE_LCD_CHARCELLS | ||
364 | display->icon(ICON_BATTERY, bar->info.battery_state); | ||
365 | |||
366 | if (bar->info.batt_charge_step > -1) | ||
367 | val = bar->info.batt_charge_step; | ||
368 | else | ||
369 | val = (bar->info.battlevel * 3 + 50) / 100; | ||
370 | display->icon(ICON_BATTERY_1, val >= 1); | ||
371 | display->icon(ICON_BATTERY_2, val >= 2); | ||
372 | display->icon(ICON_BATTERY_3, val >= 3); | ||
373 | |||
374 | val = 10 * (bar->info.volume - sound_min(SOUND_VOLUME)) | ||
375 | / (sound_max(SOUND_VOLUME) - sound_min(SOUND_VOLUME)); | ||
376 | display->icon(ICON_VOLUME, true); | ||
377 | display->icon(ICON_VOLUME_1, val >= 1); | ||
378 | display->icon(ICON_VOLUME_2, val >= 3); | ||
379 | display->icon(ICON_VOLUME_3, val >= 5); | ||
380 | display->icon(ICON_VOLUME_4, val >= 7); | ||
381 | display->icon(ICON_VOLUME_5, val >= 9); | ||
382 | |||
383 | display->icon(ICON_PLAY, current_playmode() == STATUS_PLAY); | ||
384 | display->icon(ICON_PAUSE, current_playmode() == STATUS_PAUSE); | ||
385 | |||
386 | display->icon(ICON_REPEAT, global_settings.repeat_mode != REPEAT_OFF); | ||
387 | display->icon(ICON_1, global_settings.repeat_mode == REPEAT_ONE); | ||
388 | |||
389 | display->icon(ICON_RECORD, record); | ||
390 | display->icon(ICON_AUDIO, audio); | ||
391 | display->icon(ICON_PARAM, param); | ||
392 | display->icon(ICON_USB, usb); | ||
393 | #endif /* HAVE_LCD_CHARCELLS */ | ||
394 | } | 356 | } |
395 | 357 | ||
396 | #ifdef HAVE_LCD_BITMAP | 358 | #ifdef HAVE_LCD_BITMAP |