forked from len0rd/rockbox
Revert "plugin load / tagtree retrieval: eliminate storage_disk_is_active check"
ata_disk_is_active() behavior with SSDs has reverted, so we want to keep this.
This reverts commit ef19fa4408
.
Change-Id: I29f08617285747c17a52352bd7bba4069e71cde6
This commit is contained in:
parent
e829ea9a5e
commit
b30f05badc
2 changed files with 16 additions and 2 deletions
|
@ -882,6 +882,10 @@ int plugin_load(const char* plugin, const void* parameter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_DISK_STORAGE
|
||||||
|
if (!storage_disk_is_active())
|
||||||
|
splash(0, ID2P(LANG_WAIT));
|
||||||
|
#endif
|
||||||
strcpy(current_plugin, plugin);
|
strcpy(current_plugin, plugin);
|
||||||
current_plugin_handle = lc_open(plugin, pluginbuf, PLUGIN_BUFFER_SIZE);
|
current_plugin_handle = lc_open(plugin, pluginbuf, PLUGIN_BUFFER_SIZE);
|
||||||
if (current_plugin_handle == NULL) {
|
if (current_plugin_handle == NULL) {
|
||||||
|
|
|
@ -1465,8 +1465,18 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
|
||||||
int sort_limit;
|
int sort_limit;
|
||||||
int strip;
|
int strip;
|
||||||
|
|
||||||
/* Show search progress after 0.5s delay */
|
/* Show search progress straight away if the disk needs to spin up,
|
||||||
show_search_progress(true, 0, 0, 0);
|
otherwise show it after the normal 1/2 second delay */
|
||||||
|
show_search_progress(
|
||||||
|
#ifdef HAVE_DISK_STORAGE
|
||||||
|
#ifdef HAVE_TC_RAMCACHE
|
||||||
|
tagcache_is_in_ram() ? true :
|
||||||
|
#endif
|
||||||
|
storage_disk_is_active()
|
||||||
|
#else
|
||||||
|
true
|
||||||
|
#endif
|
||||||
|
, 0, 0, 0);
|
||||||
|
|
||||||
if (c->currtable == TABLE_ALLSUBENTRIES)
|
if (c->currtable == TABLE_ALLSUBENTRIES)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue