diff options
| author | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2008-04-14 15:51:40 +0000 |
|---|---|---|
| committer | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2008-04-14 15:51:40 +0000 |
| commit | a5ad74ffcaf8fc4d29fbc4457239d822c0215cde (patch) | |
| tree | 79ff0d4479b6e6451893047008f45b5db9ec96a7 /apps | |
| parent | 3c9625969bd6dc235ac5fc8a1678ce7d89a9203c (diff) | |
| download | rockbox-a5ad74ffcaf8fc4d29fbc4457239d822c0215cde.zip rockbox-a5ad74ffcaf8fc4d29fbc4457239d822c0215cde.tar.gz rockbox-a5ad74ffcaf8fc4d29fbc4457239d822c0215cde.tar.bz2 rockbox-a5ad74ffcaf8fc4d29fbc4457239d822c0215cde.tar.xz | |
Revert what was left of r17018 until I find a better way. It had quirks in some cases, and doesn't play well with what I'm about to commit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17108 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/gwps-common.c | 8 | ||||
| -rw-r--r-- | apps/playback.c | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 8fc1f36..5986928 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c @@ -833,15 +833,7 @@ 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: diff --git a/apps/playback.c b/apps/playback.c index 6f18b57..ef2d653 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -585,7 +585,6 @@ struct mp3entry* audio_current_track(void) strncpy(temp_id3.path, p, sizeof(temp_id3.path)-1); temp_id3.title = &temp_id3.path[0]; - temp_id3.index = playlist_get_display_index() - 1 + wps_offset; return &temp_id3; } @@ -1628,8 +1627,6 @@ static bool audio_load_track(int offset, bool start_play) { if (get_metadata(&id3, fd, trackname)) { - id3.index = playlist_get_display_index() + last_peek_offset - 1; - send_event(PLAYBACK_EVENT_TRACK_BUFFER, &id3); tracks[track_widx].id3_hid = |