diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-29 22:29:25 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-29 22:29:25 -0500 |
| commit | 15cee60021eada542b2dae0fafbb3150fcaa5010 (patch) | |
| tree | 5fc73ceb1c5136b7051292ea938bf6c2eb55aff6 /libs/backends/jack | |
| parent | d63e8ba0e8eeda4f53684bbd20f027c0cd6f7c89 (diff) | |
| parent | d1cc7e5a50e2144d7aea01bc5eceed6657513c1b (diff) | |
merge and resolve conflict with master
Diffstat (limited to 'libs/backends/jack')
| -rw-r--r-- | libs/backends/jack/jack_audiobackend.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index 332b6eec85..8df97a1e30 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -155,11 +155,11 @@ JACKAudioBackend::enumerate_devices () const } vector<float> -JACKAudioBackend::available_sample_rates (const string& /*device*/) const +JACKAudioBackend::available_sample_rates (const string& device) const { vector<float> f; - if (available()) { + if (device == _target_device && available()) { f.push_back (sample_rate()); return f; } @@ -183,11 +183,11 @@ JACKAudioBackend::available_sample_rates (const string& /*device*/) const } vector<uint32_t> -JACKAudioBackend::available_buffer_sizes (const string& /*device*/) const +JACKAudioBackend::available_buffer_sizes (const string& device) const { vector<uint32_t> s; - - if (available()) { + + if (device == _target_device && available()) { s.push_back (buffer_size()); return s; } |