From 149fb181caec224cfe0a2473b44cef9e5ff8a5ad Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Mon, 24 Jan 2011 22:16:30 +0000 Subject: Backport r29081: Fix player becoming unresponsive on Stop / Pause in some cases. Fix for FS#11865: In tagtree_buffer_event, do not wait for database to come online as that may never happen. Rather, wait until it either has come online or has decided that this will never happen. Added a new function to tagcache.c to export this information. Flyspray: FS#11865 Author: Michael Hohmuth git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_7@29134 a1c6a512-1295-4272-9138-f99709370657 --- apps/tagcache.c | 4 ++++ apps/tagcache.h | 1 + apps/tagtree.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/tagcache.c b/apps/tagcache.c index 39ed99fcce..efc779d2e3 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c @@ -4645,6 +4645,10 @@ bool tagcache_is_initialized(void) { return tc_stat.initialized; } +bool tagcache_is_fully_initialized(void) +{ + return tc_stat.readyvalid; +} bool tagcache_is_usable(void) { return tc_stat.initialized && tc_stat.ready; diff --git a/apps/tagcache.h b/apps/tagcache.h index b52da76a0f..19608063c8 100644 --- a/apps/tagcache.h +++ b/apps/tagcache.h @@ -246,6 +246,7 @@ void tagcache_unload_ramcache(void); #endif void tagcache_init(void) INIT_ATTR; bool tagcache_is_initialized(void); +bool tagcache_is_fully_initialized(void); bool tagcache_is_usable(void); void tagcache_start_scan(void); void tagcache_stop_scan(void); diff --git a/apps/tagtree.c b/apps/tagtree.c index 75caab01d4..0e0536c2fd 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c @@ -652,7 +652,7 @@ static void tagtree_buffer_event(void *data) logf("be:%s", id3->path); - while (! tagcache_is_usable()) + while (! tagcache_is_fully_initialized()) yield(); if (!tagcache_find_index(&tcs, id3->path)) -- cgit v1.2.3