bluez: cleaned module and set media class to Bluez/<direction>/<profile>
This commit is contained in:
@@ -11,11 +11,18 @@
|
|||||||
* and automatically creates pipewire audio nodes to play and capture audio
|
* and automatically creates pipewire audio nodes to play and capture audio
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <spa/utils/keys.h>
|
||||||
#include <spa/utils/names.h>
|
#include <spa/utils/names.h>
|
||||||
#include <spa/monitor/monitor.h>
|
#include <spa/monitor/monitor.h>
|
||||||
#include <pipewire/pipewire.h>
|
#include <pipewire/pipewire.h>
|
||||||
#include <wp/wp.h>
|
#include <wp/wp.h>
|
||||||
|
|
||||||
|
enum wp_bluez_profile {
|
||||||
|
WP_BLUEZ_A2DP = 0,
|
||||||
|
WP_BLUEZ_HEADUNIT = 1, /* HSP/HFP Head Unit (Headsets) */
|
||||||
|
WP_BLUEZ_GATEWAY = 2 /* HSP/HFP Gateway (Phones) */
|
||||||
|
};
|
||||||
|
|
||||||
struct monitor {
|
struct monitor {
|
||||||
struct spa_handle *handle;
|
struct spa_handle *handle;
|
||||||
struct spa_monitor *monitor;
|
struct spa_monitor *monitor;
|
||||||
@@ -87,6 +94,112 @@ on_endpoint_created(GObject *initable, GAsyncResult *res, gpointer d)
|
|||||||
endpoint);
|
endpoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
parse_bluez_properties (const struct spa_dict *props, const gchar **name,
|
||||||
|
const gchar **media_class, enum pw_direction *direction)
|
||||||
|
{
|
||||||
|
const char *local_name = NULL;
|
||||||
|
const char *local_media_class = NULL;
|
||||||
|
enum pw_direction local_direction;
|
||||||
|
enum wp_bluez_profile profile;
|
||||||
|
|
||||||
|
/* Get the name */
|
||||||
|
local_name = spa_dict_lookup (props, "node.name");
|
||||||
|
if (!local_name)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
/* Get the media class */
|
||||||
|
local_media_class = spa_dict_lookup(props, SPA_KEY_MEDIA_CLASS);
|
||||||
|
if (!local_media_class)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
/* Get the direction */
|
||||||
|
if (g_str_has_prefix (local_media_class, "Audio/Sink"))
|
||||||
|
local_direction = PW_DIRECTION_INPUT;
|
||||||
|
else if (g_str_has_prefix (local_media_class, "Audio/Source"))
|
||||||
|
local_direction = PW_DIRECTION_OUTPUT;
|
||||||
|
else
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
/* Get the bluez profile */
|
||||||
|
/* TODO: We need to read the specific profile from a property. For now we
|
||||||
|
* get the bluez profile from the name, and we asume SCO is never a gateway.
|
||||||
|
* This will change once pipewire sets the profile property */
|
||||||
|
if (g_str_has_prefix (local_name, "api.bluez5.a2dp"))
|
||||||
|
profile = WP_BLUEZ_A2DP;
|
||||||
|
else if (g_str_has_prefix (local_name, "api.bluez5.sco"))
|
||||||
|
profile = WP_BLUEZ_HEADUNIT;
|
||||||
|
else
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
/* Set the name */
|
||||||
|
if (name)
|
||||||
|
*name = local_name;
|
||||||
|
|
||||||
|
/* Set the media class */
|
||||||
|
if (media_class) {
|
||||||
|
switch (local_direction) {
|
||||||
|
case PW_DIRECTION_INPUT:
|
||||||
|
switch (profile) {
|
||||||
|
case WP_BLUEZ_A2DP:
|
||||||
|
*media_class = "Bluez/Sink/A2dp";
|
||||||
|
break;
|
||||||
|
case WP_BLUEZ_HEADUNIT:
|
||||||
|
*media_class = "Bluez/Sink/Headunit";
|
||||||
|
break;
|
||||||
|
case WP_BLUEZ_GATEWAY:
|
||||||
|
*media_class = "Bluez/Sink/Gateway";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case PW_DIRECTION_OUTPUT:
|
||||||
|
switch (profile) {
|
||||||
|
case WP_BLUEZ_A2DP:
|
||||||
|
*media_class = "Bluez/Source/A2dp";
|
||||||
|
break;
|
||||||
|
case WP_BLUEZ_HEADUNIT:
|
||||||
|
*media_class = "Bluez/Source/Headunit";
|
||||||
|
break;
|
||||||
|
case WP_BLUEZ_GATEWAY:
|
||||||
|
*media_class = "Bluez/Source/Gateway";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Set the direction */
|
||||||
|
if (direction)
|
||||||
|
*direction = local_direction;
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* TODO: we need to find a better way to do this */
|
||||||
|
static gboolean
|
||||||
|
is_bluez_device (const struct spa_dict *props)
|
||||||
|
{
|
||||||
|
const gchar *name = NULL;
|
||||||
|
|
||||||
|
/* Get the name */
|
||||||
|
name = spa_dict_lookup (props, "node.name");
|
||||||
|
if (!name)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
/* Check if it is a bluez device */
|
||||||
|
if (!g_str_has_prefix (name, "api.bluez5"))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
on_node_added (WpRemotePipewire *rp, guint id, gconstpointer p, gpointer d)
|
on_node_added (WpRemotePipewire *rp, guint id, gconstpointer p, gpointer d)
|
||||||
{
|
{
|
||||||
@@ -98,37 +211,22 @@ on_node_added (WpRemotePipewire *rp, guint id, gconstpointer p, gpointer d)
|
|||||||
GVariantBuilder b;
|
GVariantBuilder b;
|
||||||
g_autoptr (GVariant) endpoint_props = NULL;
|
g_autoptr (GVariant) endpoint_props = NULL;
|
||||||
|
|
||||||
/* Make sure the node has properties */
|
/* Only handle bluez nodes */
|
||||||
g_return_if_fail(props);
|
g_return_if_fail(props);
|
||||||
|
if (!is_bluez_device (props))
|
||||||
/* Get the media_class */
|
|
||||||
media_class = spa_dict_lookup(props, "media.class");
|
|
||||||
|
|
||||||
/* Get the name */
|
|
||||||
name = spa_dict_lookup (props, "media.name");
|
|
||||||
if (!name)
|
|
||||||
name = spa_dict_lookup (props, "node.name");
|
|
||||||
|
|
||||||
/* Only handle bluetooth nodes */
|
|
||||||
if (!g_str_has_prefix (name, "api.bluez5"))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* Get the direction */
|
/* Parse the bluez properties */
|
||||||
if (g_str_has_prefix (media_class, "Audio/Sink")) {
|
if (!parse_bluez_properties (props, &name, &media_class, &direction)) {
|
||||||
direction = PW_DIRECTION_INPUT;
|
g_critical ("failed to parse bluez properties");
|
||||||
} else if (g_str_has_prefix (media_class, "Audio/Source")) {
|
|
||||||
direction = PW_DIRECTION_OUTPUT;
|
|
||||||
} else {
|
|
||||||
g_critical ("failed to parse direction");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set the properties */
|
/* Set the properties */
|
||||||
g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
|
g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
|
||||||
g_variant_builder_add (&b, "{sv}",
|
g_variant_builder_add (&b, "{sv}",
|
||||||
"name", name ?
|
"name", g_variant_new_take_string (
|
||||||
g_variant_new_take_string (g_strdup_printf ("Stream %u (%s)", id, name)) :
|
g_strdup_printf ("Bluez %u (%s)", id, name)));
|
||||||
g_variant_new_take_string (g_strdup_printf ("Stream %u", id)));
|
|
||||||
g_variant_builder_add (&b, "{sv}",
|
g_variant_builder_add (&b, "{sv}",
|
||||||
"media-class", g_variant_new_string (media_class));
|
"media-class", g_variant_new_string (media_class));
|
||||||
g_variant_builder_add (&b, "{sv}",
|
g_variant_builder_add (&b, "{sv}",
|
||||||
@@ -164,44 +262,43 @@ create_node(struct impl *impl, struct device *dev, uint32_t id,
|
|||||||
const struct spa_device_object_info *info)
|
const struct spa_device_object_info *info)
|
||||||
{
|
{
|
||||||
struct node *node;
|
struct node *node;
|
||||||
const char *str;
|
const char *name;
|
||||||
struct pw_properties *props = NULL;
|
struct pw_properties *props = NULL;
|
||||||
struct pw_factory *factory = NULL;
|
struct pw_factory *factory = NULL;
|
||||||
struct pw_node *adapter = NULL;
|
struct pw_node *adapter = NULL;
|
||||||
struct pw_proxy *proxy = NULL;
|
|
||||||
|
|
||||||
/* Check if the type is a node */
|
/* Check if the type is a node */
|
||||||
if (info->type != SPA_TYPE_INTERFACE_Node)
|
if (info->type != SPA_TYPE_INTERFACE_Node)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* Create the properties */
|
/* Get the bluez name */
|
||||||
props = pw_properties_new_dict(info->props);
|
name = pw_properties_get(dev->props, SPA_KEY_DEVICE_DESCRIPTION);
|
||||||
str = pw_properties_get(dev->props, SPA_KEY_DEVICE_DESCRIPTION);
|
if (name == NULL)
|
||||||
if (str == NULL)
|
name = pw_properties_get(dev->props, SPA_KEY_DEVICE_NAME);
|
||||||
str = pw_properties_get(dev->props, SPA_KEY_DEVICE_NAME);
|
if (name == NULL)
|
||||||
if (str == NULL)
|
name = pw_properties_get(dev->props, SPA_KEY_DEVICE_NICK);
|
||||||
str = pw_properties_get(dev->props, SPA_KEY_DEVICE_NICK);
|
if (name == NULL)
|
||||||
if (str == NULL)
|
name = pw_properties_get(dev->props, SPA_KEY_DEVICE_ALIAS);
|
||||||
str = pw_properties_get(dev->props, SPA_KEY_DEVICE_ALIAS);
|
if (name == NULL)
|
||||||
if (str == NULL)
|
name = "bluetooth-device";
|
||||||
str = "bluetooth-device";
|
|
||||||
pw_properties_setf(props, PW_KEY_NODE_NAME, "%s.%s", info->factory_name, str);
|
|
||||||
pw_properties_set(props, PW_KEY_NODE_DESCRIPTION, str);
|
|
||||||
pw_properties_set(props, "factory.name", info->factory_name);
|
|
||||||
|
|
||||||
/* Find the factory */
|
/* Find the factory */
|
||||||
factory = wp_remote_pipewire_find_factory(impl->remote_pipewire, "adapter");
|
factory = wp_remote_pipewire_find_factory(impl->remote_pipewire, "adapter");
|
||||||
g_return_val_if_fail (factory, NULL);
|
g_return_val_if_fail (factory, NULL);
|
||||||
|
|
||||||
|
/* Create the properties */
|
||||||
|
props = pw_properties_new_dict(info->props);
|
||||||
|
pw_properties_setf(props, PW_KEY_NODE_NAME, "%s.%s", info->factory_name, name);
|
||||||
|
pw_properties_set(props, PW_KEY_NODE_DESCRIPTION, name);
|
||||||
|
pw_properties_set(props, PW_KEY_FACTORY_NAME, info->factory_name);
|
||||||
|
|
||||||
/* Create the adapter */
|
/* Create the adapter */
|
||||||
adapter = pw_factory_create_object(factory, NULL, PW_TYPE_INTERFACE_Node,
|
adapter = pw_factory_create_object(factory, NULL, PW_TYPE_INTERFACE_Node,
|
||||||
PW_VERSION_NODE_PROXY, props, 0);
|
PW_VERSION_NODE_PROXY, props, 0);
|
||||||
g_return_val_if_fail (adapter, NULL);
|
if (!adapter) {
|
||||||
|
pw_properties_free(props);
|
||||||
/* Create the proxy */
|
return NULL;
|
||||||
proxy = wp_remote_pipewire_export(impl->remote_pipewire,
|
}
|
||||||
PW_TYPE_INTERFACE_Node, props, adapter, 0);
|
|
||||||
g_return_val_if_fail (proxy, NULL);
|
|
||||||
|
|
||||||
/* Create the node */
|
/* Create the node */
|
||||||
node = g_slice_new0(struct node);
|
node = g_slice_new0(struct node);
|
||||||
@@ -210,7 +307,13 @@ create_node(struct impl *impl, struct device *dev, uint32_t id,
|
|||||||
node->id = id;
|
node->id = id;
|
||||||
node->props = props;
|
node->props = props;
|
||||||
node->adapter = adapter;
|
node->adapter = adapter;
|
||||||
node->proxy = proxy;
|
node->proxy = wp_remote_pipewire_export(impl->remote_pipewire,
|
||||||
|
PW_TYPE_INTERFACE_Node, props, adapter, 0);
|
||||||
|
if (!node->proxy) {
|
||||||
|
pw_properties_free(props);
|
||||||
|
g_slice_free (struct node, node);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/* Add the node to the list */
|
/* Add the node to the list */
|
||||||
spa_list_append(&dev->node_list, &node->link);
|
spa_list_append(&dev->node_list, &node->link);
|
||||||
|
Reference in New Issue
Block a user