summaryrefslogtreecommitdiff
path: root/apps/tagtree.c
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2021-02-15 15:05:56 +0100
committerSolomon Peachy <pizza@shaftnet.org>2021-02-17 11:34:59 +0000
commit436e64e09eee2b83daa0c91835305fec2eec1a3f (patch)
treec4a250f4324cccee60dc7c35201bcd2fc93d9bec /apps/tagtree.c
parentabebc6b9acdbed87edd3bb40a9f76626a5180bc4 (diff)
downloadrockbox-436e64e09eee2b83daa0c91835305fec2eec1a3f.tar.gz
rockbox-436e64e09eee2b83daa0c91835305fec2eec1a3f.zip
Fix playback queue bug when "Insert Next" is used with multiple songs at once
After using “Insert Next” to insert multiple songs at once (e.g. an album from the database browser or folder from the file browser), subsequent Insert operations will incorrectly insert items after the first song of all items that were previously inserted, instead of after the last song of the previously inserted items. A bug fix was originally written by Costas Calamvokis for the file browser only. I adopted the original fix and added code analogous to it so that it works from the database browser as well. See FS#7898, FS#7363 or this forum post for more info: https://forums.rockbox.org/index.php/topic,53741.0.html Change-Id: Ie2718e136df0b340000f7a171e9e806cf23a27b4
Diffstat (limited to 'apps/tagtree.c')
-rw-r--r--apps/tagtree.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/apps/tagtree.c b/apps/tagtree.c
index f006baa581..97e0c67b62 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -2018,18 +2018,9 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue
2018 } 2018 }
2019 } 2019 }
2020 2020
2021 if (position == PLAYLIST_INSERT_FIRST) 2021 from = 0;
2022 { 2022 to = c->filesindir;
2023 from = c->filesindir - 1; 2023 direction = 1;
2024 to = -1;
2025 direction = -1;
2026 }
2027 else
2028 {
2029 from = 0;
2030 to = c->filesindir;
2031 direction = 1;
2032 }
2033 2024
2034 for (i = from; i != to; i += direction) 2025 for (i = from; i != to; i += direction)
2035 { 2026 {
@@ -2049,6 +2040,11 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue
2049 break; 2040 break;
2050 } 2041 }
2051 yield(); 2042 yield();
2043
2044 if (position == PLAYLIST_INSERT_FIRST)
2045 {
2046 position = PLAYLIST_INSERT;
2047 }
2052 } 2048 }
2053 playlist_sync(NULL); 2049 playlist_sync(NULL);
2054 tagcache_search_finish(&tcs); 2050 tagcache_search_finish(&tcs);