fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-05-05 06:38:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

m-device-activation: sync with core before activating to make sure jack-device is exported

Browse source
This commit is contained in:
Julian Bouzas 2020-05-26 14:29:35 -04:00
parent 2c64dd4476
commit 3e12d239ef
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/module-device-activation.c
View file

@ -10,6 +10,7 @@
#include <pipewire/pipewire.h>
#include <spa/utils/keys.h>
#include <spa/utils/names.h>
#include "module-device-activation/reserve-device.h"
#include "module-device-activation/reserve-node.h"
@ -151,10 +152,15 @@ on_device_added (WpObjectManager *om, WpProxy *proxy, gpointer d)
}
static void
wp_device_activation_activate (WpPlugin * plugin)
activate_sync (WpCore *core, GAsyncResult *res, WpDeviceActivation *self)
{
WpDeviceActivation *self = WP_DEVICE_ACTIVATION (plugin);
g_autoptr (WpCore) core = wp_plugin_get_core (WP_PLUGIN (self));
g_autoptr (GError) error = NULL;
/* Check for errors */
if (!wp_core_sync_finish (core, res, &error)) {
wp_warning_object (self, "core sync error: %s", error->message);
return;
}
/* Create the devices object manager and handle the device added signal */
self->spa_devices_om = wp_object_manager_new ();
@ -176,6 +182,16 @@ wp_device_activation_activate (WpPlugin * plugin)
wp_core_install_object_manager (core, self->nodes_om);
}
static void
wp_device_activation_activate (WpPlugin * plugin)
{
WpDeviceActivation *self = WP_DEVICE_ACTIVATION (plugin);
g_autoptr (WpCore) core = wp_plugin_get_core (WP_PLUGIN (self));
/* Sync to make sure jack device is exported before activating the plugin */
wp_core_sync (core, NULL, (GAsyncReadyCallback) activate_sync, self);
}
static void
wp_device_activation_deactivate (WpPlugin * plugin)
{