diff options
author | Kjell Ericson <kjell@haxx.se> | 2003-01-13 11:48:41 +0000 |
---|---|---|
committer | Kjell Ericson <kjell@haxx.se> | 2003-01-13 11:48:41 +0000 |
commit | c8e0fff99f381df9336382dbd81893925920c731 (patch) | |
tree | 26cbec7380c904960c12c632cc3a7804ede9a94f | |
parent | 739d4010a0dfc4cd1cf565ceae35146d33e655ed (diff) | |
download | rockbox-c8e0fff99f381df9336382dbd81893925920c731.tar.gz rockbox-c8e0fff99f381df9336382dbd81893925920c731.zip |
Cleaning up code for Player.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3075 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/wps-display.c | 13 | ||||
-rw-r--r-- | apps/wps-display.h | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/apps/wps-display.c b/apps/wps-display.c index a5b8cbca19..0a988566b8 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -59,6 +59,7 @@ | |||
59 | 59 | ||
60 | #ifdef HAVE_LCD_CHARCELLS | 60 | #ifdef HAVE_LCD_CHARCELLS |
61 | unsigned char wps_progress_pat=0; | 61 | unsigned char wps_progress_pat=0; |
62 | static bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count); | ||
62 | #endif | 63 | #endif |
63 | 64 | ||
64 | static char format_buffer[FORMAT_BUFFER_SIZE]; | 65 | static char format_buffer[FORMAT_BUFFER_SIZE]; |
@@ -374,8 +375,6 @@ static char* get_tag(struct mp3entry* id3, | |||
374 | case 'b': /* progress bar */ | 375 | case 'b': /* progress bar */ |
375 | *flags |= WPS_REFRESH_PLAYER_PROGRESS; | 376 | *flags |= WPS_REFRESH_PLAYER_PROGRESS; |
376 | #ifdef HAVE_LCD_CHARCELLS | 377 | #ifdef HAVE_LCD_CHARCELLS |
377 | if (wps_progress_pat==0) | ||
378 | wps_progress_pat=lcd_get_locked_pattern(); | ||
379 | snprintf(buf, buf_size, "%c", wps_progress_pat); | 378 | snprintf(buf, buf_size, "%c", wps_progress_pat); |
380 | return buf; | 379 | return buf; |
381 | #else | 380 | #else |
@@ -637,6 +636,11 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, unsigned char refresh_mo | |||
637 | */ | 636 | */ |
638 | bool enable_pm = false; | 637 | bool enable_pm = false; |
639 | #endif | 638 | #endif |
639 | #ifdef HAVE_LCD_CHARCELLS | ||
640 | if (wps_progress_pat==0) | ||
641 | wps_progress_pat=lcd_get_locked_pattern(); | ||
642 | #endif | ||
643 | |||
640 | if (!id3) | 644 | if (!id3) |
641 | { | 645 | { |
642 | lcd_stop_scroll(); | 646 | lcd_stop_scroll(); |
@@ -768,7 +772,7 @@ bool wps_display(struct mp3entry* id3) | |||
768 | } | 772 | } |
769 | 773 | ||
770 | #if defined(HAVE_LCD_CHARCELLS) | 774 | #if defined(HAVE_LCD_CHARCELLS) |
771 | bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count) | 775 | static bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count) |
772 | { | 776 | { |
773 | char player_progressbar[7]; | 777 | char player_progressbar[7]; |
774 | char binline[36]; | 778 | char binline[36]; |
@@ -778,9 +782,6 @@ bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count) | |||
778 | if (!id3) | 782 | if (!id3) |
779 | return false; | 783 | return false; |
780 | 784 | ||
781 | if (wps_progress_pat==0) | ||
782 | wps_progress_pat=lcd_get_locked_pattern(); | ||
783 | |||
784 | memset(binline, 1, sizeof binline); | 785 | memset(binline, 1, sizeof binline); |
785 | memset(player_progressbar, 1, sizeof player_progressbar); | 786 | memset(player_progressbar, 1, sizeof player_progressbar); |
786 | 787 | ||
diff --git a/apps/wps-display.h b/apps/wps-display.h index cda90ffffe..7054343b5e 100644 --- a/apps/wps-display.h +++ b/apps/wps-display.h | |||
@@ -38,8 +38,4 @@ bool wps_display(struct mp3entry* id3); | |||
38 | bool wps_load(char* file, bool display); | 38 | bool wps_load(char* file, bool display); |
39 | void wps_reset(void); | 39 | void wps_reset(void); |
40 | 40 | ||
41 | #ifdef HAVE_LCD_CHARCELLS | ||
42 | bool draw_player_progress(struct mp3entry* id3, int ff_rewind_count); | ||
43 | #endif | ||
44 | |||
45 | #endif | 41 | #endif |