From e35eff126aea5ed4e1a2070969a7f3d5db15ac00 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Wed, 22 May 2019 01:31:55 -0400 Subject: [PATCH] show taskbar progress for scanner --- tasks/task_database.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/task_database.c b/tasks/task_database.c index 0c7e43e134..54e4b766e6 100644 --- a/tasks/task_database.c +++ b/tasks/task_database.c @@ -39,6 +39,7 @@ #include "../configuration.h" #include "../retroarch.h" #include "../ui/ui_companion_driver.h" +#include "../gfx/video_display_server.h" #endif #include "../verbosity.h" #ifndef COLLECTION_SIZE @@ -157,7 +158,7 @@ static int task_database_iterate_start(retro_task_t *task, task_free_title(task); task_set_title(task, strdup(msg)); if (db->list->size != 0) - task_set_progress(task, roundf((float)db->list_ptr / (float)db->list->size * 100.0f)); + task_set_progress(task, roundf((float)db->list_ptr / ((float)db->list->size / 100.0f))); #else fprintf(stderr, "msg: %s\n", msg); #endif @@ -1363,6 +1364,15 @@ task_finished: free(dbinfo); } +#ifdef RARCH_INTERNAL +static void task_database_progress_cb(retro_task_t *task) +{ + if (!task) + return; + video_display_server_set_window_progress(task->progress, task->finished); +} +#endif + bool task_push_dbscan( const char *playlist_directory, const char *content_database, @@ -1387,6 +1397,7 @@ bool task_push_dbscan( t->alternative_look = true; #ifdef RARCH_INTERNAL + t->progress_cb = task_database_progress_cb; db->scan_without_core_match = settings->bools.scan_without_core_match; #endif db->show_hidden_files = db_dir_show_hidden_files;