diff options
Diffstat (limited to 'apps/status.c')
-rw-r--r-- | apps/status.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/status.c b/apps/status.c index c777a9e8ab..38a732a814 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -48,6 +48,7 @@ void status_init(void) | |||
48 | void status_set_playmode(enum playmode mode) | 48 | void status_set_playmode(enum playmode mode) |
49 | { | 49 | { |
50 | current_mode = mode; | 50 | current_mode = mode; |
51 | status_draw(); | ||
51 | } | 52 | } |
52 | 53 | ||
53 | #ifdef HAVE_LCD_BITMAP | 54 | #ifdef HAVE_LCD_BITMAP |
@@ -63,10 +64,10 @@ bool statusbar(bool state) | |||
63 | 64 | ||
64 | void status_draw(void) | 65 | void status_draw(void) |
65 | { | 66 | { |
66 | #if defined(HAVE_LCD_CHARCELLS) | ||
67 | int battlevel = battery_level(); | 67 | int battlevel = battery_level(); |
68 | int volume = mpeg_val2phys(SOUND_VOLUME, global_settings.volume); | 68 | int volume = mpeg_val2phys(SOUND_VOLUME, global_settings.volume); |
69 | 69 | ||
70 | #if defined(HAVE_LCD_CHARCELLS) | ||
70 | lcd_icon(ICON_BATTERY, true); | 71 | lcd_icon(ICON_BATTERY, true); |
71 | if(battlevel > 25) | 72 | if(battlevel > 25) |
72 | lcd_icon(ICON_BATTERY_1, true); | 73 | lcd_icon(ICON_BATTERY_1, true); |
@@ -126,9 +127,6 @@ void status_draw(void) | |||
126 | } | 127 | } |
127 | #endif | 128 | #endif |
128 | #ifdef HAVE_LCD_BITMAP | 129 | #ifdef HAVE_LCD_BITMAP |
129 | int battlevel = battery_level(); | ||
130 | int volume = mpeg_val2phys(SOUND_VOLUME, global_settings.volume); | ||
131 | |||
132 | if(global_settings.statusbar && statusbar_enabled) { | 130 | if(global_settings.statusbar && statusbar_enabled) { |
133 | statusbar_wipe(); | 131 | statusbar_wipe(); |
134 | #ifdef HAVE_CHARGE_CTRL | 132 | #ifdef HAVE_CHARGE_CTRL |
@@ -155,7 +153,8 @@ void status_draw(void) | |||
155 | } | 153 | } |
156 | } | 154 | } |
157 | 155 | ||
158 | if(battery_state) statusbar_icon_battery(battlevel, plug_state); | 156 | if (battery_state) |
157 | statusbar_icon_battery(battlevel, plug_state); | ||
159 | #else | 158 | #else |
160 | statusbar_icon_battery(battlevel, false); | 159 | statusbar_icon_battery(battlevel, false); |
161 | #endif | 160 | #endif |
@@ -170,8 +169,9 @@ void status_draw(void) | |||
170 | if (keys_locked) | 169 | if (keys_locked) |
171 | statusbar_icon_lock(); | 170 | statusbar_icon_lock(); |
172 | #ifdef HAVE_RTC | 171 | #ifdef HAVE_RTC |
173 | statusbar_time(); | 172 | statusbar_time( rtc_read(3)*60 + rtc_read(2) ); |
174 | #endif | 173 | #endif |
174 | |||
175 | #ifdef SIMULATOR | 175 | #ifdef SIMULATOR |
176 | lcd_update(); | 176 | lcd_update(); |
177 | #else | 177 | #else |