diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2021-11-21 14:19:20 +0100 |
---|---|---|
committer | Christian Soffke <christian.soffke@gmail.com> | 2021-12-03 02:58:19 +0100 |
commit | 101d431d796600952dfd7deb591538af6c874d45 (patch) | |
tree | 0fddc188568337805306cc1aa7a5002b3263b914 | |
parent | 9597d7256d6b38b886bc4b1520fdbcc915c92034 (diff) | |
download | rockbox-101d431d796600952dfd7deb591538af6c874d45.tar.gz rockbox-101d431d796600952dfd7deb591538af6c874d45.zip |
PictureFlow: Fix playback behavior after appending
- Once items have been appended, the existing playlist can
not be reused when selecting an album for regular
playback, since the playlist will be out of sync with the
album's track list
- Don't re-shuffle playlist after appending items
Change-Id: I3b6035033ad1d59f9916c711f13737bb0987c4f6
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 17cff600af..31baf4a578 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -3529,7 +3529,7 @@ static void start_playback(bool append) | |||
3529 | else | 3529 | else |
3530 | return; | 3530 | return; |
3531 | 3531 | ||
3532 | if (rb->global_settings->playlist_shuffle) | 3532 | if (!append && rb->global_settings->playlist_shuffle) |
3533 | position = rb->playlist_shuffle(*rb->current_tick, pf_tracks.sel); | 3533 | position = rb->playlist_shuffle(*rb->current_tick, pf_tracks.sel); |
3534 | play: | 3534 | play: |
3535 | /* TODO: can we adjust selected_track if !play_selected ? | 3535 | /* TODO: can we adjust selected_track if !play_selected ? |
@@ -3540,8 +3540,10 @@ play: | |||
3540 | rb->playlist_start(position, 0, 0); | 3540 | rb->playlist_start(position, 0, 0); |
3541 | /* make warn on playlist erase work */ | 3541 | /* make warn on playlist erase work */ |
3542 | rb->playlist_get_current()->num_inserted_tracks = 0; | 3542 | rb->playlist_get_current()->num_inserted_tracks = 0; |
3543 | old_playlist = center_slide.slide_index; | ||
3543 | } | 3544 | } |
3544 | old_playlist = center_slide.slide_index; | 3545 | else |
3546 | old_playlist = -1; | ||
3545 | old_shuffle = shuffle; | 3547 | old_shuffle = shuffle; |
3546 | } | 3548 | } |
3547 | #endif | 3549 | #endif |