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

media-session: make the same node name as PulseAudio

Browse source 
Fixes #299
This commit is contained in:
Wim Taymans 2020-09-22 12:58:46 +02:00
parent 66cc13cc56
commit 3f844f7b09
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -243,7 +243,7 @@ static struct node *alsa_create_node(struct device *device, uint32_t id,
} }
priority = device->priority; priority = device->priority;
if (!strcmp(stream, "capture")) if (node->direction == PW_DIRECTION_OUTPUT)
priority += 1000; priority += 1000;
priority -= atol(dev) * 16; priority -= atol(dev) * 16;
priority -= atol(subdev); priority -= atol(subdev);
@ -277,9 +277,12 @@ static struct node *alsa_create_node(struct device *device, uint32_t id,
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)
devname = "unknown"; devname = "unnamed-device";
pw_properties_setf(node->props, SPA_KEY_NODE_NAME, "%s.%s.%s.%s", if (strstr(devname, "alsa_card.") == devname)
devname, stream, dev, subdev); devname += 10;
pw_properties_setf(node->props, SPA_KEY_NODE_NAME, "%s.%s.%s",
node->direction == PW_DIRECTION_OUTPUT ?
"alsa_input" : "alsa_output", devname, profile);
} }
if (pw_properties_get(node->props, PW_KEY_NODE_DESCRIPTION) == NULL) { if (pw_properties_get(node->props, PW_KEY_NODE_DESCRIPTION) == NULL) {
const char *desc, *name = NULL; const char *desc, *name = NULL;