From c6c1e8f9ee078d066bdf097d784da4f4d242968a Mon Sep 17 00:00:00 2001 From: whatdoineed2do/Ray Date: Tue, 14 Jul 2020 21:43:45 +0100 Subject: [PATCH] [alsa] dump_card() includes ALSA device name Include ALSA's device name in the ALSA modules 'info' logging to help identify sound devices as seen by the system for assisting config setup Many configs use ALSA's hw ids to refer to device but ALSA can also use device names: laudio: Available ALSA playback mixer(s) on hw:0 CARD=Intel (HDA Intel): 'Master' 'Headphone' 'Speaker' 'PCM' 'Mic' 'Beep' laudio: Available ALSA playback mixer(s) on hw:1 CARD=E30 (E30): 'E30 ' From the example above can use these ALSA names interchangably: 'hw:0' and 'hw:Intel' 'hw:1' and 'hw:E30' --- src/outputs/alsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/outputs/alsa.c b/src/outputs/alsa.c index e7044821..2263995a 100644 --- a/src/outputs/alsa.c +++ b/src/outputs/alsa.c @@ -247,7 +247,7 @@ dump_card(int card, snd_ctl_card_info_t *info) if (mixerstr[0] == '\0') sprintf(mixerstr, " (no mixers found)"); - DPRINTF(E_INFO, L_LAUDIO, "Available ALSA playback mixer(s) on '%s' (%s):%s\n", hwdev, snd_ctl_card_info_get_name(info), mixerstr); + DPRINTF(E_INFO, L_LAUDIO, "Available ALSA playback mixer(s) on %s CARD=%s (%s):%s\n", hwdev, snd_ctl_card_info_get_id(info), snd_ctl_card_info_get_name(info), mixerstr); errormixer: snd_mixer_close(mixer);