summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2003-06-04 14:18:47 +0000
committerBjörn Stenberg <bjorn@haxx.se>2003-06-04 14:18:47 +0000
commit7bc69aa084fe3d0577303fbf6cf1569a19cde390 (patch)
tree754762563d72bfce2c1aea7a24e60a49e03e3c3b /apps
parent56f771e76a8b7707553c472d08b745e45f79c64f (diff)
downloadrockbox-7bc69aa084fe3d0577303fbf6cf1569a19cde390.tar.gz
rockbox-7bc69aa084fe3d0577303fbf6cf1569a19cde390.zip
Fixed %pp for shuffled dirs (patch #700465)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3726 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/wps-display.c7
-rw-r--r--apps/wps.c9
2 files changed, 13 insertions, 3 deletions
diff --git a/apps/wps-display.c b/apps/wps-display.c
index acb839ea50..cc8009ec5c 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -414,7 +414,12 @@ static char* get_tag(struct mp3entry* id3,
#endif
case 'p': /* Playlist Position */
*flags |= WPS_REFRESH_STATIC;
- snprintf(buf, buf_size, "%d", id3->index + 1);
+ {
+ int index = id3->index - playlist_first_index();
+ if (index < 0)
+ index += playlist_amount();
+ snprintf(buf, buf_size, "%d", index + 1);
+ }
return buf;
case 'n': /* Playlist Name (without path) */
diff --git a/apps/wps.c b/apps/wps.c
index 7a22e1cc35..c5a27d9e9d 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -223,8 +223,13 @@ bool browse_id3(void)
case 7:
lcd_puts(0, 0, str(LANG_ID3_PLAYLIST));
- snprintf(scroll_text,sizeof(scroll_text), "%d/%d",
- id3->index + 1, playlist_amount());
+ {
+ int index = id3->index - playlist_first_index();
+ if (index < 0)
+ index += playlist_amount();
+ snprintf(scroll_text,sizeof(scroll_text), "%d/%d",
+ index + 1, playlist_amount());
+ }
lcd_puts_scroll(0, 1, scroll_text);
break;