diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/recorder/icons.c | 94 |
1 files changed, 52 insertions, 42 deletions
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index c1177c9e3b..a6df8c9c23 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c | |||
@@ -24,8 +24,6 @@ | |||
24 | 24 | ||
25 | #include "icons.h" | 25 | #include "icons.h" |
26 | 26 | ||
27 | #ifdef HAVE_LCD_BITMAP | ||
28 | |||
29 | unsigned char slider_bar[] = | 27 | unsigned char slider_bar[] = |
30 | { | 28 | { |
31 | 0x38, 0x28, 0x28, 0x28, 0x28, | 29 | 0x38, 0x28, 0x28, 0x28, 0x28, |
@@ -159,7 +157,7 @@ void statusbar_wipe(void) | |||
159 | int x; | 157 | int x; |
160 | 158 | ||
161 | for (x = 0; x < LCD_WIDTH; x++) | 159 | for (x = 0; x < LCD_WIDTH; x++) |
162 | lcd_framebuffer[x][STATUSBAR_Y_POS/8]=0x00; | 160 | lcd_framebuffer[x][STATUSBAR_Y_POS / 8] = 0; |
163 | } | 161 | } |
164 | 162 | ||
165 | /* | 163 | /* |
@@ -171,31 +169,35 @@ void statusbar_icon_battery(int percent, bool charging) | |||
171 | int fill; | 169 | int fill; |
172 | 170 | ||
173 | /* draw battery */ | 171 | /* draw battery */ |
174 | for(i=0;i<17;i++) { | 172 | for (i=0; i < 17; i++) { |
175 | DRAW_PIXEL((ICON_BATTERY_X_POS+i),STATUSBAR_Y_POS); | 173 | DRAW_PIXEL(ICON_BATTERY_X_POS + i, STATUSBAR_Y_POS); |
176 | DRAW_PIXEL((ICON_BATTERY_X_POS+i),(STATUSBAR_Y_POS+6)); | 174 | DRAW_PIXEL(ICON_BATTERY_X_POS + i, STATUSBAR_Y_POS + 6); |
177 | } | 175 | } |
178 | for(i=1;i<6;i++) { | 176 | |
179 | DRAW_PIXEL(ICON_BATTERY_X_POS,(STATUSBAR_Y_POS+i)); | 177 | for (i=1; i < 6; i++) { |
180 | DRAW_PIXEL((ICON_BATTERY_X_POS+16),(STATUSBAR_Y_POS+i)); | 178 | DRAW_PIXEL(ICON_BATTERY_X_POS, STATUSBAR_Y_POS + i); |
179 | DRAW_PIXEL(ICON_BATTERY_X_POS + 16, STATUSBAR_Y_POS + i); | ||
181 | } | 180 | } |
182 | for(i=2;i<5;i++) | 181 | |
183 | DRAW_PIXEL((ICON_BATTERY_X_POS+17),(STATUSBAR_Y_POS+i)); | 182 | for (i=2; i < 5; i++) |
183 | DRAW_PIXEL(ICON_BATTERY_X_POS + 17, STATUSBAR_Y_POS + i); | ||
184 | 184 | ||
185 | /* fill battery */ | 185 | /* fill battery */ |
186 | fill=percent; | 186 | fill=percent; |
187 | if(fill<0) | 187 | if (fill < 0) |
188 | fill=0; | 188 | fill = 0; |
189 | if(fill>100) | 189 | if (fill > 100) |
190 | fill=100; | 190 | fill = 100; |
191 | fill=fill*15/100; | ||
192 | 191 | ||
193 | for(i=1;i<=fill;i++) | 192 | fill = fill * 15 / 100; |
194 | for(j=1;j<6;j++) | ||
195 | DRAW_PIXEL((ICON_BATTERY_X_POS+i),(STATUSBAR_Y_POS+j)); | ||
196 | 193 | ||
197 | if(charging) | 194 | for (i=1; i <= fill; i++) |
198 | lcd_bitmap(bitmap_icon_7x8[Icon_Plug], ICON_PLUG_X_POS, STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT, false); | 195 | for (j=1; j < 6; j++) |
196 | DRAW_PIXEL(ICON_BATTERY_X_POS + i, STATUSBAR_Y_POS + j); | ||
197 | |||
198 | if (charging) | ||
199 | lcd_bitmap(bitmap_icon_7x8[Icon_Plug], ICON_PLUG_X_POS, | ||
200 | STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT, false); | ||
199 | }; | 201 | }; |
200 | 202 | ||
201 | /* | 203 | /* |
@@ -210,30 +212,35 @@ void statusbar_icon_volume(int percent) | |||
210 | static long switch_tick; | 212 | static long switch_tick; |
211 | static int last_volume; | 213 | static int last_volume; |
212 | 214 | ||
213 | volume=percent; | 215 | volume = percent; |
214 | if(volume<0) | 216 | if (volume < 0) |
215 | volume=0; | 217 | volume = 0; |
216 | if(volume>100) | 218 | if (volume > 100) |
217 | volume=100; | 219 | volume = 100; |
218 | 220 | ||
219 | if(volume==0) | 221 | if (volume==0) { |
220 | lcd_bitmap(bitmap_icon_7x8[Icon_Mute], ICON_VOLUME_X_POS+ICON_VOLUME_WIDTH/2-4, STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT, false); | 222 | lcd_bitmap(bitmap_icon_7x8[Icon_Mute], |
223 | ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - 4, | ||
224 | STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT, false); | ||
225 | } | ||
221 | else { | 226 | else { |
222 | if(last_volume!=volume) { | 227 | if (last_volume != volume) { |
223 | switch_tick=current_tick+HZ; | 228 | switch_tick = current_tick + HZ; |
224 | last_volume=volume; | 229 | last_volume = volume; |
225 | } | 230 | } |
226 | if(TIME_BEFORE(current_tick,switch_tick)) { /* display volume lever numerical */ | 231 | /* display volume lever numerical? */ |
232 | if (TIME_BEFORE(current_tick,switch_tick)) { | ||
227 | snprintf(buffer, sizeof(buffer), "%2d", percent); | 233 | snprintf(buffer, sizeof(buffer), "%2d", percent); |
228 | lcd_putsxy(ICON_VOLUME_X_POS+ICON_VOLUME_WIDTH/2-6*strlen(buffer)/2, STATUSBAR_Y_POS, buffer, 0); | 234 | lcd_putsxy(ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - |
235 | 6*strlen(buffer)/2, STATUSBAR_Y_POS, buffer, 0); | ||
229 | } | 236 | } |
230 | else { /* display volume bar */ | 237 | else { /* display volume bar */ |
231 | volume=volume*14/100; | 238 | volume = volume * 14 / 100; |
232 | for(i=0;i<volume;i++) { | 239 | for(i=0; i < volume; i++) { |
233 | if(i%2 == 0) | 240 | if(i%2 == 0) |
234 | step++; | 241 | step++; |
235 | for(j=1;j<=step;j++) | 242 | for(j=1; j <= step; j++) |
236 | DRAW_PIXEL((ICON_VOLUME_X_POS+i),(STATUSBAR_Y_POS+7-j)); | 243 | DRAW_PIXEL(ICON_VOLUME_X_POS + i, STATUSBAR_Y_POS + 7 - j); |
237 | } | 244 | } |
238 | } | 245 | } |
239 | } | 246 | } |
@@ -244,7 +251,8 @@ void statusbar_icon_volume(int percent) | |||
244 | */ | 251 | */ |
245 | void statusbar_icon_play_state(int state) | 252 | void statusbar_icon_play_state(int state) |
246 | { | 253 | { |
247 | lcd_bitmap(bitmap_icon_7x8[state], ICON_PLAY_STATE_X_POS, STATUSBAR_Y_POS, ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); | 254 | lcd_bitmap(bitmap_icon_7x8[state], ICON_PLAY_STATE_X_POS, STATUSBAR_Y_POS, |
255 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); | ||
248 | } | 256 | } |
249 | 257 | ||
250 | /* | 258 | /* |
@@ -252,7 +260,8 @@ void statusbar_icon_play_state(int state) | |||
252 | */ | 260 | */ |
253 | void statusbar_icon_play_mode(int mode) | 261 | void statusbar_icon_play_mode(int mode) |
254 | { | 262 | { |
255 | lcd_bitmap(bitmap_icon_7x8[mode], ICON_PLAY_MODE_X_POS, STATUSBAR_Y_POS, ICON_PLAY_MODE_WIDTH, STATUSBAR_HEIGHT, false); | 263 | lcd_bitmap(bitmap_icon_7x8[mode], ICON_PLAY_MODE_X_POS, STATUSBAR_Y_POS, |
264 | ICON_PLAY_MODE_WIDTH, STATUSBAR_HEIGHT, false); | ||
256 | } | 265 | } |
257 | 266 | ||
258 | /* | 267 | /* |
@@ -260,7 +269,8 @@ void statusbar_icon_play_mode(int mode) | |||
260 | */ | 269 | */ |
261 | void statusbar_icon_shuffle(void) | 270 | void statusbar_icon_shuffle(void) |
262 | { | 271 | { |
263 | lcd_bitmap(bitmap_icon_7x8[Icon_Shuffle], ICON_SHUFFLE_X_POS, STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT, false); | 272 | lcd_bitmap(bitmap_icon_7x8[Icon_Shuffle], ICON_SHUFFLE_X_POS, |
273 | STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT, false); | ||
264 | } | 274 | } |
265 | 275 | ||
266 | /* | 276 | /* |
@@ -268,7 +278,8 @@ void statusbar_icon_shuffle(void) | |||
268 | */ | 278 | */ |
269 | void statusbar_icon_lock(void) | 279 | void statusbar_icon_lock(void) |
270 | { | 280 | { |
271 | lcd_bitmap(bitmap_icon_5x8[Icon_Lock], LOCK_X_POS, STATUSBAR_Y_POS, 5, 8, false); | 281 | lcd_bitmap(bitmap_icon_5x8[Icon_Lock], LOCK_X_POS, |
282 | STATUSBAR_Y_POS, 5, 8, false); | ||
272 | } | 283 | } |
273 | 284 | ||
274 | #ifdef HAVE_RTC | 285 | #ifdef HAVE_RTC |
@@ -291,4 +302,3 @@ void statusbar_time(void) | |||
291 | lcd_putsxy(TIME_X_POS, STATUSBAR_Y_POS, buffer, 0); | 302 | lcd_putsxy(TIME_X_POS, STATUSBAR_Y_POS, buffer, 0); |
292 | } | 303 | } |
293 | #endif | 304 | #endif |
294 | #endif | ||