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

remove -Woverload-virtual ambiguity (from 1d3690d)

Browse source 
this breaks compilation in engine_dialog.cc
This commit is contained in:
Robin Gareus 2015-08-11 23:43:45 +02:00
parent bb5c969ac0
commit 548340eb05
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -219,7 +219,7 @@ CoreAudioBackend::available_sample_rates (const std::string& device) const
}
std::vector<float>
CoreAudioBackend::available_sample_rates (const std::string& input_device, const std::string& output_device) const
CoreAudioBackend::available_sample_rates2 (const std::string& input_device, const std::string& output_device) const
{
std::vector<float> sr;
std::vector<float> sr_in;
@ -254,7 +254,7 @@ CoreAudioBackend::available_buffer_sizes (const std::string& device) const
}
std::vector<uint32_t>
CoreAudioBackend::available_buffer_sizes (const std::string& input_device, const std::string& output_device) const
CoreAudioBackend::available_buffer_sizes2 (const std::string& input_device, const std::string& output_device) const
{
std::vector<uint32_t> bs;
std::vector<uint32_t> bs_in;
@ -332,7 +332,7 @@ CoreAudioBackend::set_output_device_name (const std::string& d)
int
CoreAudioBackend::set_sample_rate (float sr)
{
std::vector<float> srs = available_sample_rates (_input_audio_device, _output_audio_device);
std::vector<float> srs = available_sample_rates2 (_input_audio_device, _output_audio_device);
if (std::find(srs.begin(), srs.end(), sr) == srs.end()) {
return -1;
}