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

m-device-activation: always activate bluez5 devices

Browse Source
This commit is contained in:
Julian Bouzas
2020-06-08 13:07:12 -04:00
parent e68cd7b700
commit 3add067254
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
modules/module-device-activation.c
View File

@@ -127,27 +127,44 @@ add_reserve_device_data (WpDeviceActivation * self, WpProxy *device,
g_steal_pointer (&device_data), g_object_unref);
}
static void
set_device_profile (WpProxy *device, gint index)
{
g_return_if_fail (device);
g_autoptr (WpSpaPod) profile = wp_spa_pod_new_object (
"Profile", "Profile",
"index", "i", index,
NULL);
wp_proxy_set_param (device, "Profile", profile);
}
static void
on_device_added (WpObjectManager *om, WpProxy *proxy, gpointer d)
{
WpDeviceActivation *self = WP_DEVICE_ACTIVATION (d);
const gchar *card_id = NULL;
const gchar *device_api = wp_proxy_get_property (proxy, PW_KEY_DEVICE_API);
g_return_if_fail (device_api);
/* TODO: for now we only activate devices with the ALSA Card property set.
* However, we eventually need to handle Video and MIDI devices too */
card_id = wp_proxy_get_property (proxy, SPA_KEY_API_ALSA_CARD);
if (!card_id)
return;
/* Depending on the mode, activate or let dbus activate the devices */
/* ALSA */
if (g_str_has_prefix (device_api, "alsa")) {
/* If "dbus" mode, let dbus handle the activation, otherwise activate */
if (self->mode && g_strcmp0 (self->mode, "dbus") == 0) {
add_reserve_device_data (self, proxy, atoi (card_id));
const gchar *id = wp_proxy_get_property (proxy, SPA_KEY_API_ALSA_CARD);
g_return_if_fail (id);
add_reserve_device_data (self, proxy, atoi (id));
} else {
g_autoptr (WpSpaPod) profile = wp_spa_pod_new_object (
"Profile", "Profile",
"index", "i", 1,
NULL);
wp_proxy_set_param (proxy, "Profile", profile);
set_device_profile (proxy, 1);
}
}
/* Bluez5 */
else if (g_str_has_prefix (device_api, "bluez5")) {
set_device_profile (proxy, 1);
}
/* Video */
else if (g_str_has_prefix (device_api, "v4l2")) {
/* No need to activate video devices */
}
}