ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/audio_backend.h
View File

@ -195,7 +195,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine {
* implement this function and return an intersection (not union) of available * implement this function and return an intersection (not union) of available
* sample rates valid for the given input + output device combination. * sample rates valid for the given input + output device combination.
*/ */
virtual std::vector<float> available_sample_rates (const std::string& input_device, const std::string& output_device) const { virtual std::vector<float> available_sample_rates2 (const std::string& input_device, const std::string& output_device) const {
std::vector<float> input_sizes = available_sample_rates (input_device); std::vector<float> input_sizes = available_sample_rates (input_device);
std::vector<float> output_sizes = available_sample_rates (output_device); std::vector<float> output_sizes = available_sample_rates (output_device);
std::vector<float> rv; std::vector<float> rv;
@ -228,7 +228,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine {
* implement this function and return an intersection (not union) of available * implement this function and return an intersection (not union) of available
* buffer sizes valid for the given input + output device combination. * buffer sizes valid for the given input + output device combination.
*/ */
virtual std::vector<uint32_t> available_buffer_sizes (const std::string& input_device, const std::string& output_device) const { virtual std::vector<uint32_t> available_buffer_sizes2 (const std::string& input_device, const std::string& output_device) const {
std::vector<uint32_t> input_rates = available_buffer_sizes (input_device); std::vector<uint32_t> input_rates = available_buffer_sizes (input_device);
std::vector<uint32_t> output_rates = available_buffer_sizes (output_device); std::vector<uint32_t> output_rates = available_buffer_sizes (output_device);
std::vector<uint32_t> rv; std::vector<uint32_t> rv;

4
libs/backends/alsa/alsa_audiobackend.cc
View File

@ -216,7 +216,7 @@ AlsaAudioBackend::acquire_device(const char* device_name)
} }
std::vector<float> std::vector<float>
AlsaAudioBackend::available_sample_rates (const std::string& input_device, const std::string& output_device) const AlsaAudioBackend::available_sample_rates2 (const std::string& input_device, const std::string& output_device) const
{ {
std::vector<float> sr; std::vector<float> sr;
if (input_device == _("None") && output_device == _("None")) { if (input_device == _("None") && output_device == _("None")) {
@ -262,7 +262,7 @@ AlsaAudioBackend::available_sample_rates (const std::string& device) const
} }
std::vector<uint32_t> std::vector<uint32_t>
AlsaAudioBackend::available_buffer_sizes (const std::string& input_device, const std::string& output_device) const AlsaAudioBackend::available_buffer_sizes2 (const std::string& input_device, const std::string& output_device) const
{ {
std::vector<uint32_t> bs; std::vector<uint32_t> bs;
if (input_device == _("None") && output_device == _("None")) { if (input_device == _("None") && output_device == _("None")) {

4
libs/backends/alsa/alsa_audiobackend.h
View File

@ -171,9 +171,9 @@ class AlsaAudioBackend : public AudioBackend {
std::vector<DeviceStatus> enumerate_input_devices () const; std::vector<DeviceStatus> enumerate_input_devices () const;
std::vector<DeviceStatus> enumerate_output_devices () const; std::vector<DeviceStatus> enumerate_output_devices () const;
std::vector<float> available_sample_rates (const std::string& device) const; std::vector<float> available_sample_rates (const std::string& device) const;
std::vector<float> available_sample_rates (const std::string&, const std::string&) const; std::vector<float> available_sample_rates2 (const std::string&, const std::string&) const;
std::vector<uint32_t> available_buffer_sizes (const std::string& device) const; std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
std::vector<uint32_t> available_buffer_sizes (const std::string&, const std::string&) const; std::vector<uint32_t> available_buffer_sizes2 (const std::string&, const std::string&) const;
uint32_t available_input_channel_count (const std::string& device) const; uint32_t available_input_channel_count (const std::string& device) const;
uint32_t available_output_channel_count (const std::string& device) const; uint32_t available_output_channel_count (const std::string& device) const;

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> 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;
std::vector<float> sr_in; std::vector<float> sr_in;
@ -254,7 +254,7 @@ CoreAudioBackend::available_buffer_sizes (const std::string& device) const
} }
std::vector<uint32_t> 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;
std::vector<uint32_t> bs_in; std::vector<uint32_t> bs_in;
@ -332,7 +332,7 @@ CoreAudioBackend::set_output_device_name (const std::string& d)
int int
CoreAudioBackend::set_sample_rate (float sr) 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()) { if (std::find(srs.begin(), srs.end(), sr) == srs.end()) {
return -1; return -1;
} }

4
libs/backends/coreaudio/coreaudio_backend.h
View File

@ -171,9 +171,9 @@ class CoreAudioBackend : public AudioBackend {
std::vector<DeviceStatus> enumerate_output_devices () const; std::vector<DeviceStatus> enumerate_output_devices () const;
std::vector<float> available_sample_rates (const std::string& device) const; std::vector<float> available_sample_rates (const std::string& device) const;
std::vector<float> available_sample_rates (const std::string&, const std::string&) const; std::vector<float> available_sample_rates2 (const std::string&, const std::string&) const;
std::vector<uint32_t> available_buffer_sizes (const std::string& device) const; std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
std::vector<uint32_t> available_buffer_sizes (const std::string&, const std::string&) const; std::vector<uint32_t> available_buffer_sizes2 (const std::string&, const std::string&) const;
uint32_t available_input_channel_count (const std::string& device) const; uint32_t available_input_channel_count (const std::string& device) const;
uint32_t available_output_channel_count (const std::string& device) const; uint32_t available_output_channel_count (const std::string& device) const;