summaryrefslogtreecommitdiff
path: root/libs/ardour/engine_state_controller.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-05-09 19:34:50 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2015-06-29 14:18:11 -0400
commitfab465c4cca420f8e0fb5f5469f7e6aa67f871c5 (patch)
treef11fa3cb9ad90aa06f432508615496952b5c5163 /libs/ardour/engine_state_controller.cc
parentc57aecafb18e6c3868bdce6db0ee5cfaf801dca6 (diff)
bring in more connection-related changes from Tracks
Diffstat (limited to 'libs/ardour/engine_state_controller.cc')
-rw-r--r--libs/ardour/engine_state_controller.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/engine_state_controller.cc b/libs/ardour/engine_state_controller.cc
index 64273eb38c..4bcf345175 100644
--- a/libs/ardour/engine_state_controller.cc
+++ b/libs/ardour/engine_state_controller.cc
@@ -582,10 +582,10 @@ EngineStateController::_validate_current_device_state()
std::vector<pframes_t>::iterator bs_iter = std::find (buffer_sizes.begin(), buffer_sizes.end(), _current_state->buffer_size);
// if current is not found switch to default if is supported
if (bs_iter == buffer_sizes.end()) {
- bs_iter = std::find (buffer_sizes.begin(), buffer_sizes.end(), backend->default_buffer_size ());
+ bs_iter = std::find (buffer_sizes.begin(), buffer_sizes.end(), backend->default_buffer_size (_current_state->device_name));
if (bs_iter != buffer_sizes.end()) {
- _current_state->buffer_size = backend->default_buffer_size ();
+ _current_state->buffer_size = backend->default_buffer_size (_current_state->device_name);
} else {
if (!buffer_sizes.empty()) {
_current_state->buffer_size = buffer_sizes.front();
@@ -665,7 +665,7 @@ EngineStateController::get_default_buffer_size() const
{
boost::shared_ptr<AudioBackend> backend = AudioEngine::instance()->current_backend();
assert(backend);
- return backend->default_buffer_size();
+ return backend->default_buffer_size(_current_state->device_name);
}