ardour/livetrax
13
0
Fork 0
Code

fix API version SNAFU caused by re-copying EngineStateController out of Tracks

Browse Source
This commit is contained in:
Paul Davis 2015-05-26 11:37:44 -04:00
parent 0f9cac978e
commit 92b023b908
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/engine_state_controller.cc
View File

@ -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); 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 current is not found switch to default if is supported
if (bs_iter == buffer_sizes.end ()) { 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 ()) { 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 { } else {
if (!buffer_sizes.empty ()) { if (!buffer_sizes.empty ()) {
_current_state->buffer_size = buffer_sizes.front (); _current_state->buffer_size = buffer_sizes.front ();
@ -745,7 +745,7 @@ EngineStateController::get_default_buffer_size () const
{ {
boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend (); boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend ();
assert (backend); assert (backend);
return backend->default_buffer_size (); return backend->default_buffer_size (_current_state->device_name);
} }