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().

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index 2f854d6cc86e0dde767e0a163b169d2d2d374acf..4591fee4093c05e14744184a0c21cc743b9f9af7 100644 (file)
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -271,7 +271,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                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);
        if (ret < 0) {
                sr_err("Unable to obtain poll descriptors: %s.",

diff --git a/hardware/alsa/protocol.c b/hardware/alsa/protocol.c
index f3c1d7b49c045b07a3b0e5e1a6e8000cbe7b61b5..4a9f02f3075342c7ed239f63225531fa7652e36f 100644 (file)
--- a/hardware/alsa/protocol.c
+++ b/hardware/alsa/protocol.c
@@ -219,11 +219,11 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
        (void)options;
 
        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;
        }
        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;
        }
 
@@ -231,14 +231,14 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
        while (snd_card_next(&card) >= 0 && card >= 0) {
                snprintf(hwcard, sizeof(hwcard), "hw:%d", card);
                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;
                }
                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));
                        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));
                        }
                        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_STREAM_CAPTURE);
                        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));
                                continue;
                        }
@@ -271,7 +271,7 @@ SR_PRIV GSList *alsa_scan(GSList *options, struct sr_dev_driver *di)
                                             di, pcminfo);
                }
                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));
                }
        }