colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

component-loader: activate & register objects through a common code path

Browse Source 
Do this in wp_core_load_component() and let the component loaders worry
only about creating the object.

Also run the main loop in tests while loading components, to ensure
that the async operation finishes before continuing execution. GTask
makes sure to make the operation async always, by emitting the callback
from an idle GSource.
This commit is contained in:
George Kiagiadakis
2023-05-26 21:22:48 +03:00
parent d0e96358ea
commit 7fdbf7ff50
8 changed files with 74 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/module-lua-scripting/module.c
View File

@@ -160,20 +160,6 @@ find_script (const gchar * script, WpCore *core)
script, "scripts");
}
static void
on_script_loaded (WpObject *object, GAsyncResult *res, gpointer data)
{
g_autoptr (GTask) task = G_TASK (data);
g_autoptr (GError) error = NULL;
if (!wp_object_activate_finish (object, res, &error)) {
g_task_return_error (task, g_steal_pointer (&error));
return;
}
g_task_return_pointer (task, g_object_ref (object), g_object_unref);
}
static void
wp_lua_scripting_plugin_load (WpComponentLoader * cl, WpCore * core,
const gchar * component, const gchar * type, WpSpaJson * args,
@@ -220,12 +206,7 @@ wp_lua_scripting_plugin_load (WpComponentLoader * cl, WpCore * core,
"arguments", args,
NULL);
/* register the script */
wp_plugin_register (g_object_ref (script));
/* enable script */
wp_object_activate (WP_OBJECT (script), WP_OBJECT_FEATURES_ALL, NULL,
(GAsyncReadyCallback) on_script_loaded, g_object_ref (task));
g_task_return_pointer (task, g_steal_pointer (&script), g_object_unref);
}
static GObject *