summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorKjell Ericson <kjell@haxx.se>2003-01-13 11:48:41 +0000
committerKjell Ericson <kjell@haxx.se>2003-01-13 11:48:41 +0000
commitc8e0fff99f381df9336382dbd81893925920c731 (patch)
tree26cbec7380c904960c12c632cc3a7804ede9a94f /apps
parent739d4010a0dfc4cd1cf565ceae35146d33e655ed (diff)
downloadrockbox-c8e0fff99f381df9336382dbd81893925920c731.tar.gz
rockbox-c8e0fff99f381df9336382dbd81893925920c731.tar.bz2
rockbox-c8e0fff99f381df9336382dbd81893925920c731.zip
Cleaning up code for Player.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3075 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/wps-display.c13
-rw-r--r--apps/wps-display.h4
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 @@
#ifdef HAVE_LCD_CHARCELLS
unsigned char wps_progress_pat=0;
+static bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count);
#endif
static char format_buffer[FORMAT_BUFFER_SIZE];
@@ -374,8 +375,6 @@ static char* get_tag(struct mp3entry* id3,
case 'b': /* progress bar */
*flags |= WPS_REFRESH_PLAYER_PROGRESS;
#ifdef HAVE_LCD_CHARCELLS
- if (wps_progress_pat==0)
- wps_progress_pat=lcd_get_locked_pattern();
snprintf(buf, buf_size, "%c", wps_progress_pat);
return buf;
#else
@@ -637,6 +636,11 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, unsigned char refresh_mo
*/
bool enable_pm = false;
#endif
+#ifdef HAVE_LCD_CHARCELLS
+ if (wps_progress_pat==0)
+ wps_progress_pat=lcd_get_locked_pattern();
+#endif
+
if (!id3)
{
lcd_stop_scroll();
@@ -768,7 +772,7 @@ bool wps_display(struct mp3entry* id3)
}
#if defined(HAVE_LCD_CHARCELLS)
-bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count)
+static bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count)
{
char player_progressbar[7];
char binline[36];
@@ -778,9 +782,6 @@ bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count)
if (!id3)
return false;
- if (wps_progress_pat==0)
- wps_progress_pat=lcd_get_locked_pattern();
-
memset(binline, 1, sizeof binline);
memset(player_progressbar, 1, sizeof player_progressbar);
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);
bool wps_load(char* file, bool display);
void wps_reset(void);
-#ifdef HAVE_LCD_CHARCELLS
-bool draw_player_progress(struct mp3entry* id3, int ff_rewind_count);
-#endif
-
#endif