X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=alsa_pool.cpp;h=59ae595f029f8ba6cfef0d7aff12f88a97f61799;hb=4a0187ffb4075b4d217b8d9e9c96cac548b199d8;hp=348c6232303ab561d3a4039ca69932261bd3e8bc;hpb=f0dacf505189f0cadcd89a2b632000fd9d012bd2;p=nageru diff --git a/alsa_pool.cpp b/alsa_pool.cpp index 348c623..59ae595 100644 --- a/alsa_pool.cpp +++ b/alsa_pool.cpp @@ -185,19 +185,24 @@ ALSAPool::ProbeResult ALSAPool::probe_device_once(unsigned card_index, unsigned } unique_ptr ctl_closer(ctl, snd_ctl_close); + snprintf(address, sizeof(address), "hw:%d,%d", card_index, dev_index); + snd_pcm_info_t *pcm_info; snd_pcm_info_alloca(&pcm_info); snd_pcm_info_set_device(pcm_info, dev_index); snd_pcm_info_set_subdevice(pcm_info, 0); snd_pcm_info_set_stream(pcm_info, SND_PCM_STREAM_CAPTURE); - if (snd_ctl_pcm_info(ctl, pcm_info) < 0) { + err = snd_ctl_pcm_info(ctl, pcm_info); + if (err == -ENOENT) { + // Not a capture card. + return ALSAPool::ProbeResult::FAILURE; + } + if (err < 0) { // Not available for capture. printf("%s: Not available for capture.\n", address); return ALSAPool::ProbeResult::DEFER; } - snprintf(address, sizeof(address), "hw:%d,%d", card_index, dev_index); - unsigned num_channels = 0; // Find all channel maps for this device, and pick out the one