diff options
| author | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2008-04-07 19:09:30 +0000 |
|---|---|---|
| committer | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2008-04-07 19:09:30 +0000 |
| commit | e92c176d95dfa95917cef13dca177f16eca88103 (patch) | |
| tree | 41e89da960f7bdaa613b0f182a95d608c10f1ef3 | |
| parent | feb3b588e3c31401ed0f4f3601473a5be5b177c6 (diff) | |
| download | rockbox-e92c176d95dfa95917cef13dca177f16eca88103.tar.gz rockbox-e92c176d95dfa95917cef13dca177f16eca88103.zip | |
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.c | 8 |
1 files changed, 8 insertions, 0 deletions
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, | |||
| 824 | return playlist_name(NULL, buf, buf_size); | 824 | return playlist_name(NULL, buf, buf_size); |
| 825 | 825 | ||
| 826 | case WPS_TOKEN_PLAYLIST_POSITION: | 826 | case WPS_TOKEN_PLAYLIST_POSITION: |
| 827 | #if CONFIG_CODEC == SWCODEC | ||
| 827 | snprintf(buf, buf_size, "%d", id3->index + 1); | 828 | snprintf(buf, buf_size, "%d", id3->index + 1); |
| 829 | #else | ||
| 830 | /* On HWCODEC, using id3->index doesn't work when shuffle is | ||
| 831 | * enabled, so we get the playlist index directly. To use | ||
| 832 | * id3->index, something like what was added in r3726 would be | ||
| 833 | * required. */ | ||
| 834 | snprintf(buf, buf_size, "%d", playlist_get_display_index()); | ||
| 835 | #endif | ||
| 828 | return buf; | 836 | return buf; |
| 829 | 837 | ||
| 830 | case WPS_TOKEN_PLAYLIST_SHUFFLE: | 838 | case WPS_TOKEN_PLAYLIST_SHUFFLE: |