Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use splash_progress in database when inserting into dynamic playlist

Browse source 
Change-Id: Iaef66cc00a1be0ce3cf869f0e6137a2e9efa2713
This commit is contained in:
Christian Soffke 2022-10-09 23:39:13 +02:00 committed by William Wilgus
parent 0374dea33a
commit eb5e15803b
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/tagtree.c
View file

@ -2039,10 +2039,9 @@ int tagtree_get_filename(struct tree_context* c, char *buf, int buflen)
static bool insert_all_playlist(struct tree_context *c, int position, bool queue) static bool insert_all_playlist(struct tree_context *c, int position, bool queue)
{ {
struct tagcache_search tcs; struct tagcache_search tcs;
int i; int i, n;
unsigned long last_tick;
char buf[MAX_PATH]; char buf[MAX_PATH];
int from, to, direction;
int files_left = c->filesindir;
cpu_boost(true); cpu_boost(true);
if (!tagcache_search(&tcs, tag_filename)) if (!tagcache_search(&tcs, tag_filename))
@ -2063,15 +2062,21 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue
} }
} }
from = 0; last_tick = current_tick + HZ/2; /* Show splash after 0.5 seconds have passed */
to = c->filesindir;
direction = 1;
for (i = from; i != to; i += direction) n = c->filesindir;
for (i = 0; i < n; i++)
{ {
/* Count back to zero */ if (TIME_AFTER(current_tick, last_tick - 1))
if (!show_search_progress(false, files_left--)) {
break; splash_progress(i, n, "%s (%s)", str(LANG_WAIT), str(LANG_OFF_ABORT));
if (TIME_AFTER(current_tick, last_tick + HZ/10))
{
if (action_userabort(TIMEOUT_NOBLOCK))
break;
last_tick = current_tick;
}
}
if (!tagcache_retrieve(&tcs, tagtree_get_entry(c, i)->extraseek, if (!tagcache_retrieve(&tcs, tagtree_get_entry(c, i)->extraseek,
tcs.type, buf, sizeof buf)) tcs.type, buf, sizeof buf))