summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pennequin <nicolas.pennequin@free.fr>2008-04-07 19:09:30 +0000
committerNicolas Pennequin <nicolas.pennequin@free.fr>2008-04-07 19:09:30 +0000
commite92c176d95dfa95917cef13dca177f16eca88103 (patch)
tree41e89da960f7bdaa613b0f182a95d608c10f1ef3
parentfeb3b588e3c31401ed0f4f3601473a5be5b177c6 (diff)
downloadrockbox-e92c176d95dfa95917cef13dca177f16eca88103.zip
rockbox-e92c176d95dfa95917cef13dca177f16eca88103.tar.gz
rockbox-e92c176d95dfa95917cef13dca177f16eca88103.tar.bz2
rockbox-e92c176d95dfa95917cef13dca177f16eca88103.tar.xz
r17018 caused the WPS playlist index display to be wrong with shuffled enabled, so we revert to using playlist_get_display_index() on HWCODEC. Using id3->index would require something like what was added in r3726.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17025 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/gwps-common.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 0ec0f64..2e0afab 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -824,7 +824,15 @@ static char *get_token_value(struct gui_wps *gwps,
return playlist_name(NULL, buf, buf_size);
case WPS_TOKEN_PLAYLIST_POSITION:
+#if CONFIG_CODEC == SWCODEC
snprintf(buf, buf_size, "%d", id3->index + 1);
+#else
+ /* On HWCODEC, using id3->index doesn't work when shuffle is
+ * enabled, so we get the playlist index directly. To use
+ * id3->index, something like what was added in r3726 would be
+ * required. */
+ snprintf(buf, buf_size, "%d", playlist_get_display_index());
+#endif
return buf;
case WPS_TOKEN_PLAYLIST_SHUFFLE: