From 77e07e1948ae1c8b38f9ca417d635f9168b0516c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 20 Sep 2019 13:28:06 +0200 Subject: [PATCH] improve properties on globals and ports --- spa/plugins/alsa/alsa-udev.c | 1 + spa/plugins/bluez5/bluez5-dbus.c | 1 + spa/plugins/v4l2/v4l2-udev.c | 1 + src/modules/module-adapter/adapter.c | 6 ++++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spa/plugins/alsa/alsa-udev.c b/spa/plugins/alsa/alsa-udev.c index c9f790fc0..e14d7d07a 100644 --- a/spa/plugins/alsa/alsa-udev.c +++ b/spa/plugins/alsa/alsa-udev.c @@ -201,6 +201,7 @@ static int emit_object_info(struct impl *this, uint32_t id, struct udev_device * items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_ENUM_API, "udev"); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "alsa"); + items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Device"); if ((str = path_get_card_id(udev_device_get_property_value(dev, "DEVPATH"))) == NULL) return 0; diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c index 407290635..f7ef46844 100644 --- a/spa/plugins/bluez5/bluez5-dbus.c +++ b/spa/plugins/bluez5/bluez5-dbus.c @@ -509,6 +509,7 @@ static int device_add(struct spa_bt_monitor *monitor, struct spa_bt_device *devi info.flags = 0; items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "bluez5"); + items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Device"); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_NAME, device->name); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_ALIAS, device->alias); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_ICON_NAME, device->icon); diff --git a/spa/plugins/v4l2/v4l2-udev.c b/spa/plugins/v4l2/v4l2-udev.c index faeed10ae..33bbe8575 100644 --- a/spa/plugins/v4l2/v4l2-udev.c +++ b/spa/plugins/v4l2/v4l2-udev.c @@ -190,6 +190,7 @@ static int emit_object_info(struct impl *this, uint32_t id, struct udev_device * items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_ENUM_API,"udev"); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "v4l2"); + items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Video/Device"); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_API_V4L2_PATH, udev_device_get_devnode(dev)); diff --git a/src/modules/module-adapter/adapter.c b/src/modules/module-adapter/adapter.c index 956e5d083..dca264b50 100644 --- a/src/modules/module-adapter/adapter.c +++ b/src/modules/module-adapter/adapter.c @@ -242,8 +242,10 @@ static void node_port_init(void *data, struct pw_port *port) direction == PW_DIRECTION_INPUT ? "in" : "out", str); - pw_properties_set(new, PW_KEY_PORT_PHYSICAL, "1"); - pw_properties_set(new, PW_KEY_PORT_TERMINAL, "1"); + if (is_device) { + pw_properties_set(new, PW_KEY_PORT_PHYSICAL, "1"); + pw_properties_set(new, PW_KEY_PORT_TERMINAL, "1"); + } } pw_port_update_properties(port, &new->dict);