diff options
| author | Robin Gareus <robin@gareus.org> | 2015-08-11 23:43:45 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-08-11 23:50:56 +0200 |
| commit | 548340eb055c1483a9b8afed83f67cf14117dbc7 (patch) | |
| tree | ded17e86a505a7160faeb76d62914776b198a077 /libs/backends/alsa | |
| parent | bb5c969ac09cbc81aa7c5c3aff1d6850bffdf40f (diff) | |
remove -Woverload-virtual ambiguity (from 1d3690d)
this breaks compilation in engine_dialog.cc
Diffstat (limited to 'libs/backends/alsa')
| -rw-r--r-- | libs/backends/alsa/alsa_audiobackend.cc | 4 | ||||
| -rw-r--r-- | libs/backends/alsa/alsa_audiobackend.h | 4 |
2 files changed, 4 insertions, 4 deletions
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<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; if (input_device == _("None") && output_device == _("None")) { @@ -262,7 +262,7 @@ AlsaAudioBackend::available_sample_rates (const std::string& device) const } 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; 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<DeviceStatus> enumerate_input_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&, 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&, 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_output_channel_count (const std::string& device) const; |