smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

half-duplex Coreaudio support.

Browse source
This commit is contained in:
Robin Gareus 2015-06-04 02:44:58 +02:00
parent 3d2f298fb2
commit b36d95d971
2 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libs/backends/coreaudio/coreaudio_backend.cc
View file

@ -164,6 +164,7 @@ CoreAudioBackend::enumerate_input_devices () const
std::map<size_t, std::string> devices;
_pcmio->input_device_list(devices);
_input_audio_device_status.push_back (DeviceStatus (_("None"), true));
for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
if (_input_audio_device == "") _input_audio_device = i->second;
_input_audio_device_status.push_back (DeviceStatus (i->second, true));
@ -179,6 +180,7 @@ CoreAudioBackend::enumerate_output_devices () const
std::map<size_t, std::string> devices;
_pcmio->output_device_list(devices);
_output_audio_device_status.push_back (DeviceStatus (_("None"), true));
for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
if (_output_audio_device == "") _output_audio_device = i->second;
_output_audio_device_status.push_back (DeviceStatus (i->second, true));
@ -193,12 +195,23 @@ CoreAudioBackend::available_sample_rates (const std::string&) const
std::vector<float> sr_in;
std::vector<float> sr_out;
_pcmio->available_sample_rates(name_to_id(_input_audio_device), sr_in);
_pcmio->available_sample_rates(name_to_id(_output_audio_device), sr_out);
// TODO allow to use different SR per device, tweak aggregate
std::set_intersection(sr_in.begin(), sr_in.end(), sr_out.begin(), sr_out.end(), std::back_inserter(sr));
return sr;
const uint32_t inp = name_to_id(_input_audio_device);
const uint32_t out = name_to_id(_output_audio_device);
if (inp == UINT32_MAX && out == UINT32_MAX) {
return sr;
} else if (inp == UINT32_MAX) {
_pcmio->available_sample_rates(out, sr_out);
return sr_out;
} else if (out == UINT32_MAX) {
_pcmio->available_sample_rates(inp, sr_in);
return sr_in;
} else {
_pcmio->available_sample_rates(inp, sr_in);
_pcmio->available_sample_rates(out, sr_out);
// TODO allow to use different SR per device, tweak aggregate
std::set_intersection(sr_in.begin(), sr_in.end(), sr_out.begin(), sr_out.end(), std::back_inserter(sr));
return sr;
}
}
std::vector<uint32_t>