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

Revert "spa: leave vendor.id and product.id in hex"

Browse source 
This reverts commit 0d33760b71.
This commit is contained in:
Wim Taymans 2022-07-11 11:23:08 +02:00
parent dd1d5960b4
commit bdfde2fdf0
2 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
spa/plugins/alsa/alsa-udev.c
View file

@ -477,9 +477,15 @@ static int emit_object_info(struct impl *this, struct device *device)
if ((str = udev_device_get_property_value(dev, "SUBSYSTEM")) && *str) { if ((str = udev_device_get_property_value(dev, "SUBSYSTEM")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_SUBSYSTEM, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_SUBSYSTEM, str);
} }
if ((str = udev_device_get_property_value(dev, "ID_VENDOR_ID")) && *str) if ((str = udev_device_get_property_value(dev, "ID_VENDOR_ID")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_ID, str); char *dec = alloca(6); /* 65535 is max */
int32_t val;
if (spa_atoi32(str, &val, 16)) {
snprintf(dec, 6, "%d", val);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_ID, dec);
}
}
str = udev_device_get_property_value(dev, "ID_VENDOR_FROM_DATABASE"); str = udev_device_get_property_value(dev, "ID_VENDOR_FROM_DATABASE");
if (!(str && *str)) { if (!(str && *str)) {
str = udev_device_get_property_value(dev, "ID_VENDOR_ENC"); str = udev_device_get_property_value(dev, "ID_VENDOR_ENC");
@ -494,9 +500,15 @@ static int emit_object_info(struct impl *this, struct device *device)
if (str && *str) { if (str && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_NAME, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_NAME, str);
} }
if ((str = udev_device_get_property_value(dev, "ID_MODEL_ID")) && *str) if ((str = udev_device_get_property_value(dev, "ID_MODEL_ID")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_PRODUCT_ID, str); char *dec = alloca(6); /* 65535 is max */
int32_t val;
if (spa_atoi32(str, &val, 16)) {
snprintf(dec, 6, "%d", val);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_PRODUCT_ID, dec);
}
}
str = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE"); str = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE");
if (!(str && *str)) { if (!(str && *str)) {
str = udev_device_get_property_value(dev, "ID_MODEL_ENC"); str = udev_device_get_property_value(dev, "ID_MODEL_ENC");

21
spa/plugins/v4l2/v4l2-udev.c
View file

@ -278,9 +278,15 @@ static int emit_object_info(struct impl *this, struct device *device)
if ((str = udev_device_get_property_value(dev, "SUBSYSTEM")) && *str) { if ((str = udev_device_get_property_value(dev, "SUBSYSTEM")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_SUBSYSTEM, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_SUBSYSTEM, str);
} }
if ((str = udev_device_get_property_value(dev, "ID_VENDOR_ID")) && *str) if ((str = udev_device_get_property_value(dev, "ID_VENDOR_ID")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_ID, str); char *dec = alloca(6); /* 65535 is max */
int32_t val;
if (spa_atoi32(str, &val, 16)) {
snprintf(dec, 6, "%d", val);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_ID, dec);
}
}
str = udev_device_get_property_value(dev, "ID_VENDOR_FROM_DATABASE"); str = udev_device_get_property_value(dev, "ID_VENDOR_FROM_DATABASE");
if (!(str && *str)) { if (!(str && *str)) {
str = udev_device_get_property_value(dev, "ID_VENDOR_ENC"); str = udev_device_get_property_value(dev, "ID_VENDOR_ENC");
@ -295,8 +301,15 @@ static int emit_object_info(struct impl *this, struct device *device)
if (str && *str) { if (str && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_NAME, str); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_VENDOR_NAME, str);
} }
if ((str = udev_device_get_property_value(dev, "ID_MODEL_ID")) && *str) if ((str = udev_device_get_property_value(dev, "ID_MODEL_ID")) && *str) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_PRODUCT_ID, str); char *dec = alloca(6); /* 65535 is max */
int32_t val;
if (spa_atoi32(str, &val, 16)) {
snprintf(dec, 6, "%d", val);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_PRODUCT_ID, dec);
}
}
str = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE"); str = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE");
if (!(str && *str)) { if (!(str && *str)) {