From d035a9b0bc2e34ada1687a110fda75485938cf23 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 9 Oct 2002 13:42:59 +0000 Subject: the playlist variables are now all static, and the wps code use the new playlist_amount() function to get amount of songs in the current list. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2549 a1c6a512-1295-4272-9138-f99709370657 --- apps/playlist.c | 6 +++--- apps/playlist.h | 1 + apps/wps-display.c | 2 +- apps/wps.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/playlist.c b/apps/playlist.c index 8483d70293..1e5c12a181 100644 --- a/apps/playlist.c +++ b/apps/playlist.c @@ -37,14 +37,14 @@ #include "lang.h" -struct playlist_info playlist; +static struct playlist_info playlist; #define PLAYLIST_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH*MAX_FILES_IN_DIR) -unsigned char playlist_buffer[PLAYLIST_BUFFER_SIZE]; +static unsigned char playlist_buffer[PLAYLIST_BUFFER_SIZE]; static int playlist_end_pos = 0; -char now_playing[MAX_PATH+1]; +static char now_playing[MAX_PATH+1]; void playlist_clear(void) { diff --git a/apps/playlist.h b/apps/playlist.h index 9f66b7f49e..24f9d7df6f 100644 --- a/apps/playlist.h +++ b/apps/playlist.h @@ -52,5 +52,6 @@ void empty_playlist(void); void add_indices_to_playlist(void); void playlist_clear(void); int playlist_add(char *filename); +int playlist_amount(void); #endif /* __PLAYLIST_H__ */ diff --git a/apps/wps-display.c b/apps/wps-display.c index b1a67884df..2972fc0a33 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c @@ -313,7 +313,7 @@ static char* get_tag(struct mp3entry* id3, return buf; case 'e': /* Playlist Total Entries */ - snprintf(buf, buf_size, "%d", playlist.amount); + snprintf(buf, buf_size, "%d", playlist_amount()); return buf; case 'c': /* Current Time in Song */ diff --git a/apps/wps.c b/apps/wps.c index e501381e4c..d2e89adff5 100644 --- a/apps/wps.c +++ b/apps/wps.c @@ -220,7 +220,7 @@ static int browse_id3(void) case 5: lcd_puts(0, 0, str(LANG_ID3_PLAYLIST)); snprintf(scroll_text,sizeof(scroll_text), "%d/%d", - id3->index + 1, playlist.amount); + id3->index + 1, playlist_amount()); lcd_puts_scroll(0, 1, scroll_text); break; -- cgit v1.2.3