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

alsa: improve configuration of NICK

Browse source
This commit is contained in:
Wim Taymans 2020-08-03 18:16:53 +02:00
parent 9943733b8c
commit 66816580bc
1 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/examples/media-session/alsa-monitor.c
View file

@ -258,6 +258,16 @@ static struct node *alsa_create_node(struct device *device, uint32_t id,
else else
pw_properties_setf(node->props, SPA_KEY_MEDIA_CLASS, "Audio/Sink"); pw_properties_setf(node->props, SPA_KEY_MEDIA_CLASS, "Audio/Sink");
} }
if (pw_properties_get(node->props, PW_KEY_NODE_NICK) == NULL) {
const char *s;
s = pw_properties_get(device->props, PW_KEY_DEVICE_NICK);
if (s == NULL)
s = pw_properties_get(device->props, SPA_KEY_API_ALSA_CARD_NAME);
if (s == NULL)
s = pw_properties_get(device->props, "alsa.card_name");
pw_properties_set(node->props, PW_KEY_NODE_NICK, s);
}
if (pw_properties_get(node->props, SPA_KEY_NODE_NAME) == NULL) { if (pw_properties_get(node->props, SPA_KEY_NODE_NAME) == NULL) {
const char *devname; const char *devname;
if ((devname = pw_properties_get(device->props, SPA_KEY_DEVICE_NAME)) == NULL) if ((devname = pw_properties_get(device->props, SPA_KEY_DEVICE_NAME)) == NULL)
@ -419,13 +429,14 @@ static int update_device_props(struct device *device)
const char *s, *d; const char *s, *d;
char temp[32]; char temp[32];
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_NAME)) == NULL) { s = pw_properties_get(p, SPA_KEY_DEVICE_NAME);
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_ID)) == NULL) { if (s == NULL)
if ((s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_PATH)) == NULL) { s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_ID);
snprintf(temp, sizeof(temp), "%d", device->id); if (s == NULL)
s = temp; s = pw_properties_get(p, SPA_KEY_DEVICE_BUS_PATH);
} if (s == NULL) {
} snprintf(temp, sizeof(temp), "%d", device->id);
s = temp;
} }
pw_properties_setf(p, PW_KEY_DEVICE_NAME, "alsa_card.%s", s); pw_properties_setf(p, PW_KEY_DEVICE_NAME, "alsa_card.%s", s);
@ -448,6 +459,12 @@ static int update_device_props(struct device *device)
pw_properties_set(p, PW_KEY_DEVICE_DESCRIPTION, d); pw_properties_set(p, PW_KEY_DEVICE_DESCRIPTION, d);
} }
if (pw_properties_get(p, PW_KEY_DEVICE_NICK) == NULL) {
s = pw_properties_get(p, SPA_KEY_API_ALSA_CARD_NAME);
if (s != NULL)
pw_properties_set(p, PW_KEY_DEVICE_NICK, s);
}
if (pw_properties_get(p, PW_KEY_DEVICE_ICON_NAME) == NULL) { if (pw_properties_get(p, PW_KEY_DEVICE_ICON_NAME) == NULL) {
d = NULL; d = NULL;