diff options
author | Daniel Stenberg <daniel@haxx.se> | 2002-10-09 13:42:59 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2002-10-09 13:42:59 +0000 |
commit | d035a9b0bc2e34ada1687a110fda75485938cf23 (patch) | |
tree | e8881f7fa9f3c5a9c0e843ca5baf768cdfc89d77 /apps | |
parent | a5c0fad61763d2e9f2648c1afdd6f88f6d36859b (diff) | |
download | rockbox-d035a9b0bc2e34ada1687a110fda75485938cf23.tar.gz rockbox-d035a9b0bc2e34ada1687a110fda75485938cf23.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playlist.c | 6 | ||||
-rw-r--r-- | apps/playlist.h | 1 | ||||
-rw-r--r-- | apps/wps-display.c | 2 | ||||
-rw-r--r-- | 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 @@ | |||
37 | 37 | ||
38 | #include "lang.h" | 38 | #include "lang.h" |
39 | 39 | ||
40 | struct playlist_info playlist; | 40 | static struct playlist_info playlist; |
41 | 41 | ||
42 | #define PLAYLIST_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH*MAX_FILES_IN_DIR) | 42 | #define PLAYLIST_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH*MAX_FILES_IN_DIR) |
43 | 43 | ||
44 | unsigned char playlist_buffer[PLAYLIST_BUFFER_SIZE]; | 44 | static unsigned char playlist_buffer[PLAYLIST_BUFFER_SIZE]; |
45 | static int playlist_end_pos = 0; | 45 | static int playlist_end_pos = 0; |
46 | 46 | ||
47 | char now_playing[MAX_PATH+1]; | 47 | static char now_playing[MAX_PATH+1]; |
48 | 48 | ||
49 | void playlist_clear(void) | 49 | void playlist_clear(void) |
50 | { | 50 | { |
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); | |||
52 | void add_indices_to_playlist(void); | 52 | void add_indices_to_playlist(void); |
53 | void playlist_clear(void); | 53 | void playlist_clear(void); |
54 | int playlist_add(char *filename); | 54 | int playlist_add(char *filename); |
55 | int playlist_amount(void); | ||
55 | 56 | ||
56 | #endif /* __PLAYLIST_H__ */ | 57 | #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, | |||
313 | return buf; | 313 | return buf; |
314 | 314 | ||
315 | case 'e': /* Playlist Total Entries */ | 315 | case 'e': /* Playlist Total Entries */ |
316 | snprintf(buf, buf_size, "%d", playlist.amount); | 316 | snprintf(buf, buf_size, "%d", playlist_amount()); |
317 | return buf; | 317 | return buf; |
318 | 318 | ||
319 | case 'c': /* Current Time in Song */ | 319 | 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) | |||
220 | case 5: | 220 | case 5: |
221 | lcd_puts(0, 0, str(LANG_ID3_PLAYLIST)); | 221 | lcd_puts(0, 0, str(LANG_ID3_PLAYLIST)); |
222 | snprintf(scroll_text,sizeof(scroll_text), "%d/%d", | 222 | snprintf(scroll_text,sizeof(scroll_text), "%d/%d", |
223 | id3->index + 1, playlist.amount); | 223 | id3->index + 1, playlist_amount()); |
224 | lcd_puts_scroll(0, 1, scroll_text); | 224 | lcd_puts_scroll(0, 1, scroll_text); |
225 | break; | 225 | break; |
226 | 226 | ||