From 548340eb055c1483a9b8afed83f67cf14117dbc7 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 11 Aug 2015 23:43:45 +0200 Subject: [PATCH] remove -Woverload-virtual ambiguity (from 1d3690d) this breaks compilation in engine_dialog.cc --- libs/ardour/ardour/audio_backend.h | 4 ++-- libs/backends/alsa/alsa_audiobackend.cc | 4 ++-- libs/backends/alsa/alsa_audiobackend.h | 4 ++-- libs/backends/coreaudio/coreaudio_backend.cc | 6 +++--- libs/backends/coreaudio/coreaudio_backend.h | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h index da47004663..ba8e244fcd 100644 --- a/libs/ardour/ardour/audio_backend.h +++ b/libs/ardour/ardour/audio_backend.h @@ -195,7 +195,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { * implement this function and return an intersection (not union) of available * sample rates valid for the given input + output device combination. */ - virtual std::vector available_sample_rates (const std::string& input_device, const std::string& output_device) const { + virtual std::vector available_sample_rates2 (const std::string& input_device, const std::string& output_device) const { std::vector input_sizes = available_sample_rates (input_device); std::vector output_sizes = available_sample_rates (output_device); std::vector rv; @@ -228,7 +228,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { * implement this function and return an intersection (not union) of available * buffer sizes valid for the given input + output device combination. */ - virtual std::vector available_buffer_sizes (const std::string& input_device, const std::string& output_device) const { + virtual std::vector available_buffer_sizes2 (const std::string& input_device, const std::string& output_device) const { std::vector input_rates = available_buffer_sizes (input_device); std::vector output_rates = available_buffer_sizes (output_device); std::vector rv; diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index 1e9ebd7764..9e811700a4 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -216,7 +216,7 @@ AlsaAudioBackend::acquire_device(const char* device_name) } std::vector -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 sr; if (input_device == _("None") && output_device == _("None")) { @@ -262,7 +262,7 @@ AlsaAudioBackend::available_sample_rates (const std::string& device) const } std::vector -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 bs; if (input_device == _("None") && output_device == _("None")) { diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h index 73eddaaf4e..e604fe0cc9 100644 --- a/libs/backends/alsa/alsa_audiobackend.h +++ b/libs/backends/alsa/alsa_audiobackend.h @@ -171,9 +171,9 @@ class AlsaAudioBackend : public AudioBackend { std::vector enumerate_input_devices () const; std::vector enumerate_output_devices () const; std::vector available_sample_rates (const std::string& device) const; - std::vector available_sample_rates (const std::string&, const std::string&) const; + std::vector available_sample_rates2 (const std::string&, const std::string&) const; std::vector available_buffer_sizes (const std::string& device) const; - std::vector available_buffer_sizes (const std::string&, const std::string&) const; + std::vector available_buffer_sizes2 (const std::string&, const std::string&) const; uint32_t available_input_channel_count (const std::string& device) const; uint32_t available_output_channel_count (const std::string& device) const; diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index 732c83c41a..4e01a2625e 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -219,7 +219,7 @@ CoreAudioBackend::available_sample_rates (const std::string& device) const } std::vector -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 sr; std::vector sr_in; @@ -254,7 +254,7 @@ CoreAudioBackend::available_buffer_sizes (const std::string& device) const } std::vector -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 bs; std::vector bs_in; @@ -332,7 +332,7 @@ CoreAudioBackend::set_output_device_name (const std::string& d) int CoreAudioBackend::set_sample_rate (float sr) { - std::vector srs = available_sample_rates (_input_audio_device, _output_audio_device); + std::vector srs = available_sample_rates2 (_input_audio_device, _output_audio_device); if (std::find(srs.begin(), srs.end(), sr) == srs.end()) { return -1; } diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h index 82c451af9e..55aaf47389 100644 --- a/libs/backends/coreaudio/coreaudio_backend.h +++ b/libs/backends/coreaudio/coreaudio_backend.h @@ -171,9 +171,9 @@ class CoreAudioBackend : public AudioBackend { std::vector enumerate_output_devices () const; std::vector available_sample_rates (const std::string& device) const; - std::vector available_sample_rates (const std::string&, const std::string&) const; + std::vector available_sample_rates2 (const std::string&, const std::string&) const; std::vector available_buffer_sizes (const std::string& device) const; - std::vector available_buffer_sizes (const std::string&, const std::string&) const; + std::vector available_buffer_sizes2 (const std::string&, const std::string&) const; uint32_t available_input_channel_count (const std::string& device) const; uint32_t available_output_channel_count (const std::string& device) const;