diff options
Diffstat (limited to 'apps/gui/statusbar.c')
-rw-r--r-- | apps/gui/statusbar.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 0c8f54f749..a43828b268 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -132,7 +132,6 @@ | |||
132 | struct gui_syncstatusbar statusbars; | 132 | struct gui_syncstatusbar statusbars; |
133 | 133 | ||
134 | /* Prototypes */ | 134 | /* Prototypes */ |
135 | #ifdef HAVE_LCD_BITMAP | ||
136 | static void gui_statusbar_icon_battery(struct screen * display, int percent, | 135 | static void gui_statusbar_icon_battery(struct screen * display, int percent, |
137 | int batt_charge_step); | 136 | int batt_charge_step); |
138 | static bool gui_statusbar_icon_volume(struct gui_statusbar * bar, int volume); | 137 | static bool gui_statusbar_icon_volume(struct gui_statusbar * bar, int volume); |
@@ -152,7 +151,6 @@ static void gui_statusbar_icon_recording_info(struct screen * display); | |||
152 | #if CONFIG_RTC | 151 | #if CONFIG_RTC |
153 | static void gui_statusbar_time(struct screen * display, struct tm *time); | 152 | static void gui_statusbar_time(struct screen * display, struct tm *time); |
154 | #endif | 153 | #endif |
155 | #endif | ||
156 | 154 | ||
157 | /* End prototypes */ | 155 | /* End prototypes */ |
158 | 156 | ||
@@ -242,7 +240,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi | |||
242 | } | 240 | } |
243 | 241 | ||
244 | bar->info.volume = global_settings.volume; | 242 | bar->info.volume = global_settings.volume; |
245 | #ifdef HAVE_LCD_BITMAP | ||
246 | bar->info.shuffle = global_settings.playlist_shuffle; | 243 | bar->info.shuffle = global_settings.playlist_shuffle; |
247 | #ifdef HAS_BUTTON_HOLD | 244 | #ifdef HAS_BUTTON_HOLD |
248 | bar->info.keylock = button_hold(); | 245 | bar->info.keylock = button_hold(); |
@@ -349,11 +346,8 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi | |||
349 | display->set_viewport(NULL); | 346 | display->set_viewport(NULL); |
350 | bar->lastinfo = bar->info; | 347 | bar->lastinfo = bar->info; |
351 | } | 348 | } |
352 | #endif /* HAVE_LCD_BITMAP */ | ||
353 | |||
354 | } | 349 | } |
355 | 350 | ||
356 | #ifdef HAVE_LCD_BITMAP | ||
357 | /* from icon.c */ | 351 | /* from icon.c */ |
358 | /* | 352 | /* |
359 | * Print battery icon to status bar | 353 | * Print battery icon to status bar |
@@ -717,8 +711,6 @@ static void gui_statusbar_icon_recording_info(struct screen * display) | |||
717 | } | 711 | } |
718 | #endif /* HAVE_RECORDING */ | 712 | #endif /* HAVE_RECORDING */ |
719 | 713 | ||
720 | #endif /* HAVE_LCD_BITMAP */ | ||
721 | |||
722 | void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) | 714 | void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) |
723 | { | 715 | { |
724 | FOR_NB_SCREENS(i) { | 716 | FOR_NB_SCREENS(i) { |
@@ -730,7 +722,6 @@ void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) | |||
730 | void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | 722 | void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, |
731 | bool force_redraw) | 723 | bool force_redraw) |
732 | { | 724 | { |
733 | #ifdef HAVE_LCD_BITMAP | ||
734 | if(!global_settings.statusbar) | 725 | if(!global_settings.statusbar) |
735 | return; | 726 | return; |
736 | struct viewport viewport; | 727 | struct viewport viewport; |
@@ -738,9 +729,6 @@ void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | |||
738 | GET_RECT(viewport,statusbar_position(i),&screens[i]); | 729 | GET_RECT(viewport,statusbar_position(i),&screens[i]); |
739 | gui_statusbar_draw( &(bars->statusbars[i]), force_redraw, &viewport ); | 730 | gui_statusbar_draw( &(bars->statusbars[i]), force_redraw, &viewport ); |
740 | } | 731 | } |
741 | #else | ||
742 | gui_statusbar_draw( &(bars->statusbars[0]), force_redraw, NULL ); | ||
743 | #endif /* HAVE_LCD_BITMAP */ | ||
744 | } | 732 | } |
745 | 733 | ||
746 | 734 | ||