diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/statusbar.c | 14 | ||||
-rw-r--r-- | apps/gui/statusbar.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index d336d8ad0e..fda54a610e 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -112,9 +112,9 @@ void gui_statusbar_init(struct gui_statusbar * bar) | |||
112 | void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | 112 | void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) |
113 | { | 113 | { |
114 | struct screen * display = bar->display; | 114 | struct screen * display = bar->display; |
115 | #ifdef HAVE_RTC | 115 | #ifdef CONFIG_RTC |
116 | struct tm* tm; /* For Time */ | 116 | struct tm* tm; /* For Time */ |
117 | #endif /* HAVE_RTC */ | 117 | #endif /* CONFIG_RTC */ |
118 | 118 | ||
119 | #ifdef HAVE_LCD_CHARCELLS | 119 | #ifdef HAVE_LCD_CHARCELLS |
120 | (void)force_redraw; /* players always "redraw" */ | 120 | (void)force_redraw; /* players always "redraw" */ |
@@ -126,11 +126,11 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
126 | bar->info.battery_safe = battery_level_safe(); | 126 | bar->info.battery_safe = battery_level_safe(); |
127 | 127 | ||
128 | #ifdef HAVE_LCD_BITMAP | 128 | #ifdef HAVE_LCD_BITMAP |
129 | #ifdef HAVE_RTC | 129 | #ifdef CONFIG_RTC |
130 | tm = get_time(); | 130 | tm = get_time(); |
131 | bar->info.hour = tm->tm_hour; | 131 | bar->info.hour = tm->tm_hour; |
132 | bar->info.minute = tm->tm_min; | 132 | bar->info.minute = tm->tm_min; |
133 | #endif /* HAVE_RTC */ | 133 | #endif /* CONFIG_RTC */ |
134 | 134 | ||
135 | bar->info.shuffle = global_settings.playlist_shuffle; | 135 | bar->info.shuffle = global_settings.playlist_shuffle; |
136 | #ifdef HAS_BUTTON_HOLD | 136 | #ifdef HAS_BUTTON_HOLD |
@@ -257,9 +257,9 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
257 | if (bar->info.keylockremote) | 257 | if (bar->info.keylockremote) |
258 | gui_statusbar_icon_lock_remote(display); | 258 | gui_statusbar_icon_lock_remote(display); |
259 | #endif | 259 | #endif |
260 | #ifdef HAVE_RTC | 260 | #ifdef CONFIG_RTC |
261 | gui_statusbar_time(display, bar->info.hour, bar->info.minute); | 261 | gui_statusbar_time(display, bar->info.hour, bar->info.minute); |
262 | #endif /* HAVE_RTC */ | 262 | #endif /* CONFIG_RTC */ |
263 | #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) | 263 | #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) |
264 | if(!display->has_disk_led && bar->info.led) | 264 | if(!display->has_disk_led && bar->info.led) |
265 | gui_statusbar_led(display); | 265 | gui_statusbar_led(display); |
@@ -482,7 +482,7 @@ void gui_statusbar_led(struct screen * display) | |||
482 | } | 482 | } |
483 | #endif | 483 | #endif |
484 | 484 | ||
485 | #ifdef HAVE_RTC | 485 | #ifdef CONFIG_RTC |
486 | /* | 486 | /* |
487 | * Print time to status bar | 487 | * Print time to status bar |
488 | */ | 488 | */ |
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index 62f6b90820..6b8e49a838 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h | |||
@@ -32,7 +32,7 @@ | |||
32 | struct status_info { | 32 | struct status_info { |
33 | int battlevel; | 33 | int battlevel; |
34 | int volume; | 34 | int volume; |
35 | #ifdef HAVE_RTC | 35 | #ifdef CONFIG_RTC |
36 | int hour; | 36 | int hour; |
37 | int minute; | 37 | int minute; |
38 | #endif | 38 | #endif |
@@ -111,7 +111,7 @@ void gui_statusbar_icon_lock_remote(struct screen * display); | |||
111 | void gui_statusbar_led(struct screen * display); | 111 | void gui_statusbar_led(struct screen * display); |
112 | 112 | ||
113 | 113 | ||
114 | #ifdef HAVE_RTC | 114 | #ifdef CONFIG_RTC |
115 | void gui_statusbar_time(struct screen * display, int hour, int minute); | 115 | void gui_statusbar_time(struct screen * display, int hour, int minute); |
116 | #endif | 116 | #endif |
117 | 117 | ||