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

alsa: put device name in separate property

Browse source
This commit is contained in:
Wim Taymans 2018-02-20 09:59:52 +01:00
parent 0e5a1b6327
commit 528d0a1c7d
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@ fill_item(struct impl *this, snd_ctl_card_info_t *card_info, snd_pcm_info_t *dev
{ {
const char *str, *name, *klass = NULL; const char *str, *name, *klass = NULL;
const struct spa_handle_factory *factory = NULL; const struct spa_handle_factory *factory = NULL;
char card_name[64]; char device_name[64];
struct type *t = &this->type; struct type *t = &this->type;
switch (snd_pcm_info_get_stream(dev_info)) { switch (snd_pcm_info_get_stream(dev_info)) {
@ -136,7 +136,7 @@ fill_item(struct impl *this, snd_ctl_card_info_t *card_info, snd_pcm_info_t *dev
if (!(name && *name)) if (!(name && *name))
name = "Unknown"; name = "Unknown";
snprintf(card_name, 64, "%s,%d", this->card_name, snd_pcm_info_get_device(dev_info)); snprintf(device_name, 64, "%s,%d", this->card_name, snd_pcm_info_get_device(dev_info));
spa_pod_builder_add(builder, spa_pod_builder_add(builder,
"<", 0, t->monitor.MonitorItem, "<", 0, t->monitor.MonitorItem,
@ -151,7 +151,8 @@ fill_item(struct impl *this, snd_ctl_card_info_t *card_info, snd_pcm_info_t *dev
":", t->monitor.info, "[", NULL); ":", t->monitor.info, "[", NULL);
spa_pod_builder_add(builder, spa_pod_builder_add(builder,
"s", "alsa.card", "s", card_name, "s", "alsa.card", "s", this->card_name,
"s", "alsa.device", "s", device_name,
"s", "alsa.card.id", "s", snd_ctl_card_info_get_id(card_info), "s", "alsa.card.id", "s", snd_ctl_card_info_get_id(card_info),
"s", "alsa.card.components", "s", snd_ctl_card_info_get_components(card_info), "s", "alsa.card.components", "s", snd_ctl_card_info_get_components(card_info),
"s", "alsa.card.driver", "s", snd_ctl_card_info_get_driver(card_info), "s", "alsa.card.driver", "s", snd_ctl_card_info_get_driver(card_info),