diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-09 13:26:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-09 13:26:40 -0400 |
| commit | 521f8eb776291bd132952eac86f3b4cbfee07df4 (patch) | |
| tree | 862cb176d9a2fb15a145afea8a47a6a961a7cc49 /libs/ardour | |
| parent | fc040a72e9d5a95f38b5beb0bd70844ef1bd6ce1 (diff) | |
more sensible ALSA device names now in use
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/jack_utils.cc | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/libs/ardour/jack_utils.cc b/libs/ardour/jack_utils.cc index 0a7f4d73bf..5e5b9b341e 100644 --- a/libs/ardour/jack_utils.cc +++ b/libs/ardour/jack_utils.cc @@ -317,8 +317,7 @@ ARDOUR::get_jack_alsa_device_names (device_map_t& devices) continue; } - std::cerr << "Ctl card name is " << snd_ctl_card_info_get_name (info) << std::endl; - std::cerr << "Ctl ID is " << snd_ctl_card_info_get_id (info) << std::endl; + string card_name = snd_ctl_card_info_get_name (info); /* change devname to use ID, not number */ @@ -326,15 +325,26 @@ ARDOUR::get_jack_alsa_device_names (device_map_t& devices) devname += snd_ctl_card_info_get_id (info); while (snd_ctl_pcm_next_device (handle, &device) >= 0 && device >= 0) { + + /* only detect duplex devices here. more + * complex arrangements are beyond our scope + */ snd_pcm_info_set_device (pcminfo, device); snd_pcm_info_set_subdevice (pcminfo, 0); - snd_pcm_info_set_stream (pcminfo, SND_PCM_STREAM_PLAYBACK); - + snd_pcm_info_set_stream (pcminfo, SND_PCM_STREAM_CAPTURE); + if (snd_ctl_pcm_info (handle, pcminfo) >= 0) { - devname += ','; - devname += PBD::to_string (device, std::dec); - devices.insert (std::make_pair (snd_pcm_info_get_name (pcminfo), devname)); + + snd_pcm_info_set_device (pcminfo, device); + snd_pcm_info_set_subdevice (pcminfo, 0); + snd_pcm_info_set_stream (pcminfo, SND_PCM_STREAM_PLAYBACK); + + if (snd_ctl_pcm_info (handle, pcminfo) >= 0) { + devname += ','; + devname += PBD::to_string (device, std::dec); + devices.insert (std::make_pair (card_name, devname)); + } } } |