diff options
Diffstat (limited to 'apps/wps-display.c')
-rw-r--r-- | apps/wps-display.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/apps/wps-display.c b/apps/wps-display.c index 5d6290d244..8d33c723a4 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
28 | 28 | ||
29 | #include "lcd.h" | 29 | #include "lcd.h" |
30 | #include "font.h" | ||
30 | #include "mpeg.h" | 31 | #include "mpeg.h" |
31 | #include "id3.h" | 32 | #include "id3.h" |
32 | #include "settings.h" | 33 | #include "settings.h" |
@@ -42,10 +43,6 @@ | |||
42 | #include "widgets.h" | 43 | #include "widgets.h" |
43 | #endif | 44 | #endif |
44 | 45 | ||
45 | #ifdef LOADABLE_FONTS | ||
46 | #include "ajf.h" | ||
47 | #endif | ||
48 | |||
49 | #define WPS_CONFIG ROCKBOX_DIR "/default.wps" | 46 | #define WPS_CONFIG ROCKBOX_DIR "/default.wps" |
50 | 47 | ||
51 | #ifdef HAVE_LCD_BITMAP | 48 | #ifdef HAVE_LCD_BITMAP |
@@ -551,11 +548,7 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all) | |||
551 | #else | 548 | #else |
552 | int w,h; | 549 | int w,h; |
553 | int offset = global_settings.statusbar ? STATUSBAR_HEIGHT : 0; | 550 | int offset = global_settings.statusbar ? STATUSBAR_HEIGHT : 0; |
554 | #ifdef LCD_PROPFONTS | 551 | lcd_getstringsize("M",FONT_UI,&w,&h); |
555 | lcd_getstringsize("M",0,&w,&h); | ||
556 | #else | ||
557 | lcd_getfontsize(0,&w,&h); | ||
558 | #endif | ||
559 | slidebar(0, i*h + offset + 1, LCD_WIDTH, 6, | 552 | slidebar(0, i*h + offset + 1, LCD_WIDTH, 6, |
560 | (id3->elapsed + ff_rewind_count) * 100 / id3->length, | 553 | (id3->elapsed + ff_rewind_count) * 100 / id3->length, |
561 | Grow_Right); | 554 | Grow_Right); |
@@ -581,15 +574,6 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all) | |||
581 | 574 | ||
582 | void wps_display(struct mp3entry* id3) | 575 | void wps_display(struct mp3entry* id3) |
583 | { | 576 | { |
584 | int font_height; | ||
585 | |||
586 | #ifdef LOADABLE_FONTS | ||
587 | unsigned char *font = lcd_getcurrentldfont(); | ||
588 | font_height = ajf_get_fontheight(font); | ||
589 | #else | ||
590 | font_height = 8; | ||
591 | #endif | ||
592 | |||
593 | lcd_clear_display(); | 577 | lcd_clear_display(); |
594 | 578 | ||
595 | if (!id3 && !mpeg_is_playing()) | 579 | if (!id3 && !mpeg_is_playing()) |