From e92c176d95dfa95917cef13dca177f16eca88103 Mon Sep 17 00:00:00 2001 From: Nicolas Pennequin Date: Mon, 7 Apr 2008 19:09:30 +0000 Subject: [PATCH] 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 --- apps/gui/gwps-common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 0ec0f6490c..2e0afab1ee 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: