mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

keys: rename device.id to device.bus-id

Browse source
This commit is contained in:
Wim Taymans 2019-08-16 21:52:32 +02:00
parent 9807e7fdab
commit 774e11bc10
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/include/spa/monitor/device.h
View file

@ -241,7 +241,6 @@ struct spa_device_methods {
#define SPA_KEY_DEVICE_NAME "device.name" /**< the name of the device */ #define SPA_KEY_DEVICE_NAME "device.name" /**< the name of the device */
#define SPA_KEY_DEVICE_ALIAS "device.alias" /**< altenative name of the device */ #define SPA_KEY_DEVICE_ALIAS "device.alias" /**< altenative name of the device */
#define SPA_KEY_DEVICE_NICK "device.nick" /**< the device short name */ #define SPA_KEY_DEVICE_NICK "device.nick" /**< the device short name */
#define SPA_KEY_DEVICE_ID "device.id" /**< the device id */
#define SPA_KEY_DEVICE_DESCRIPTION "device.description" /**< a device description */ #define SPA_KEY_DEVICE_DESCRIPTION "device.description" /**< a device description */
#define SPA_KEY_DEVICE_ICON "device.icon" /**< icon for the device. A base64 blob #define SPA_KEY_DEVICE_ICON "device.icon" /**< icon for the device. A base64 blob
* containing PNG image data */ * containing PNG image data */
@ -249,6 +248,7 @@ struct spa_device_methods {
* Ex. "sound-card-speakers-usb" */ * Ex. "sound-card-speakers-usb" */
#define SPA_KEY_DEVICE_PLUGGED_USEC "device.plugged.usec" /**< when the device was plugged */ #define SPA_KEY_DEVICE_PLUGGED_USEC "device.plugged.usec" /**< when the device was plugged */
#define SPA_KEY_DEVICE_BUS_ID "device.bus-id" /**< the device bus-id */
#define SPA_KEY_DEVICE_BUS_PATH "device.bus-path" /**< bus path to the device in the OS' #define SPA_KEY_DEVICE_BUS_PATH "device.bus-path" /**< bus path to the device in the OS'
* format. * format.
* Ex. "pci-0000:00:14.0-usb-0:3.2:1.0" */ * Ex. "pci-0000:00:14.0-usb-0:3.2:1.0" */

2
spa/plugins/alsa/alsa-monitor.c
View file

@ -226,7 +226,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_SYSFS_PATH, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_SYSFS_PATH, str);
} }
if ((str = udev_device_get_property_value(dev, "ID_ID")) && *str) { if ((str = udev_device_get_property_value(dev, "ID_ID")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_ID, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_BUS_ID, str);
} }
if ((str = udev_device_get_property_value(dev, "ID_BUS")) && *str) { if ((str = udev_device_get_property_value(dev, "ID_BUS")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_BUS, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_BUS, str);

2
spa/plugins/v4l2/v4l2-monitor.c
View file

@ -203,7 +203,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_SYSFS_PATH, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_SYSFS_PATH, str);
} }
if ((str = udev_device_get_property_value(dev, "ID_ID")) && *str) { if ((str = udev_device_get_property_value(dev, "ID_ID")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_ID, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_BUS_ID, str);
} }
if ((str = udev_device_get_property_value(dev, "ID_BUS")) && *str) { if ((str = udev_device_get_property_value(dev, "ID_BUS")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_BUS, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_BUS, str);

2
src/examples/alsa-monitor.c
View file

@ -226,7 +226,7 @@ static int update_device_props(struct alsa_object *obj)
char temp[32]; char temp[32];
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_NAME)) == NULL) { if ((s = pw_properties_get(p, SPA_KEY_DEVICE_NAME)) == NULL) {
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_ID)) == NULL) { if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_ID)) == NULL) {
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_PATH)) == NULL) { if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_PATH)) == NULL) {
snprintf(temp, sizeof(temp), "%d", obj->id); snprintf(temp, sizeof(temp), "%d", obj->id);
s = temp; s = temp;

2
src/examples/v4l2-monitor.c
View file

@ -220,7 +220,7 @@ static int v4l2_update_device_props(struct v4l2_object *obj)
char temp[32]; char temp[32];
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_NAME)) == NULL) { if ((s = pw_properties_get(p, SPA_KEY_DEVICE_NAME)) == NULL) {
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_ID)) == NULL) { if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_ID)) == NULL) {
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_PATH)) == NULL) { if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_PATH)) == NULL) {
snprintf(temp, sizeof(temp), "%d", obj->id); snprintf(temp, sizeof(temp), "%d", obj->id);
s = temp; s = temp;