From f9ea1fc79d6aaff9949a5b11ae011b4e04e0e9d9 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Thu, 13 Oct 2022 00:05:34 -0400 Subject: splash_progress add delay function I figure this is a better way to allow a delay before showing the progress meter Change-Id: I909902a52619023b0b87635d2eb94ed00cb4bcec --- apps/tagtree.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'apps/tagtree.c') diff --git a/apps/tagtree.c b/apps/tagtree.c index d354d7c2a1..39bc0ab37c 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c @@ -2063,19 +2063,17 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue } last_tick = current_tick + HZ/2; /* Show splash after 0.5 seconds have passed */ - + splash_progress_set_delay(HZ / 2); /* wait 1/2 sec before progress */ n = c->filesindir; for (i = 0; i < n; i++) { - if (TIME_AFTER(current_tick, last_tick - 1)) + + splash_progress(i, n, "%s (%s)", str(LANG_WAIT), str(LANG_OFF_ABORT)); + if (TIME_AFTER(current_tick, last_tick + HZ/4)) { - 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 (action_userabort(TIMEOUT_NOBLOCK)) + break; + last_tick = current_tick; } if (!tagcache_retrieve(&tcs, tagtree_get_entry(c, i)->extraseek, -- cgit v1.2.3