BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

alsa: Silence ALSA scanning process. 

Errors while opening or configuring ALSA devices during scan for devices
should not be shown by default (i.e., no sr_err() usage). Non-working
or non-accessible devices (due to permissions or other reasons) will
simply not show up in frontends. Use sr_dbg() instead of sr_err().
This commit is contained in:
Uwe Hermann 2013-01-16 00:02:24 +01:00
parent 6b8d6f93bb
commit 3d6de074a4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/alsa/api.c
View File

@ -271,7 +271,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} }
sr_err("Getting %d poll descriptors.", count); sr_spew("Getting %d poll descriptors.", count);
ret = snd_pcm_poll_descriptors(devc->capture_handle, devc->ufds, count); ret = snd_pcm_poll_descriptors(devc->capture_handle, devc->ufds, count);
if (ret < 0) { if (ret < 0) {
sr_err("Unable to obtain poll descriptors: %s.", sr_err("Unable to obtain poll descriptors: %s.",

14
hardware/alsa/protocol.c
View File

@ -219,11 +219,11 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
(void)options; (void)options;
if ((ret = snd_ctl_card_info_malloc(&info)) < 0) { if ((ret = snd_ctl_card_info_malloc(&info)) < 0) {
sr_err("Failed to malloc card info: %s.", snd_strerror(ret)); sr_dbg("Failed to malloc card info: %s.", snd_strerror(ret));
return NULL; return NULL;
} }
if ((ret = snd_pcm_info_malloc(&pcminfo) < 0)) { if ((ret = snd_pcm_info_malloc(&pcminfo) < 0)) {
sr_err("Cannot malloc pcm info: %s.", snd_strerror(ret)); sr_dbg("Cannot malloc pcm info: %s.", snd_strerror(ret));
return NULL; return NULL;
} }
@ -231,14 +231,14 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
while (snd_card_next(&card) >= 0 && card >= 0) { while (snd_card_next(&card) >= 0 && card >= 0) {
snprintf(hwcard, sizeof(hwcard), "hw:%d", card); snprintf(hwcard, sizeof(hwcard), "hw:%d", card);
if ((ret = snd_ctl_open(&handle, hwcard, 0)) < 0) { if ((ret = snd_ctl_open(&handle, hwcard, 0)) < 0) {
sr_err("Cannot open (%d): %s.", card, snd_strerror(ret)); sr_dbg("Cannot open (%d): %s.", card, snd_strerror(ret));
continue; continue;
} }
if ((ret = snd_ctl_card_info(handle, info)) < 0) { if ((ret = snd_ctl_card_info(handle, info)) < 0) {
sr_err("Cannot get hardware info (%d): %s.", sr_dbg("Cannot get hardware info (%d): %s.",
card, snd_strerror(ret)); card, snd_strerror(ret));
if ((ret = snd_ctl_close(handle)) < 0) { if ((ret = snd_ctl_close(handle)) < 0) {
sr_err("Cannot close device (%d): %s.", sr_dbg("Cannot close device (%d): %s.",
card, snd_strerror(ret)); card, snd_strerror(ret));
} }
continue; continue;
@ -256,7 +256,7 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
snd_pcm_info_set_stream(pcminfo, snd_pcm_info_set_stream(pcminfo,
SND_PCM_STREAM_CAPTURE); SND_PCM_STREAM_CAPTURE);
if ((ret = snd_ctl_pcm_info(handle, pcminfo)) < 0) { if ((ret = snd_ctl_pcm_info(handle, pcminfo)) < 0) {
sr_err("Cannot get device info (%s): %s.", sr_dbg("Cannot get device info (%s): %s.",
hwdev, snd_strerror(ret)); hwdev, snd_strerror(ret));
continue; continue;
} }
@ -271,7 +271,7 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
di, pcminfo); di, pcminfo);
} }
if ((ret = snd_ctl_close(handle)) < 0) { if ((ret = snd_ctl_close(handle)) < 0) {
sr_err("Cannot close device (%d): %s.", sr_dbg("Cannot close device (%d): %s.",
card, snd_strerror(ret)); card, snd_strerror(ret));
} }
} }