diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-15 19:32:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-15 19:32:21 +0000 |
| commit | c4c40340855dff6191a670d3130d65b1e79dc8a0 (patch) | |
| tree | 91c79d2dd3c4bb3e2f53c5d303c4ef0877c38526 /libs/ardour/session_transport.cc | |
| parent | eee943304c8d7afbb7c92e200670a1ee01c34ab5 (diff) | |
fix all manner of things relating to io connections, setting capture alignment, and so on. still needs more tests of actual precise placement of newly recorded material
git-svn-id: svn://localhost/ardour2/branches/3.0@9155 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_transport.cc')
| -rw-r--r-- | libs/ardour/session_transport.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 248172fcd9..3dc1f9e7b3 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -226,7 +226,7 @@ Session::realtime_stop (bool abort, bool clear_state) /* we rolled past the stop point to pick up data that had not yet arrived. move back to where the stop occured. */ - decrement_transport_position (current_block_size + (worst_playback_latency() - current_block_size)); + decrement_transport_position (current_block_size + (worst_input_latency() - current_block_size)); } else { decrement_transport_position (current_block_size); } @@ -1047,7 +1047,7 @@ Session::stop_transport (bool abort, bool clear_state) return; } - if (actively_recording() && !(transport_sub_state & StopPendingCapture) && worst_playback_latency() > current_block_size) { + if (actively_recording() && !(transport_sub_state & StopPendingCapture) && worst_input_latency() > current_block_size) { boost::shared_ptr<RouteList> rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { @@ -1075,7 +1075,6 @@ Session::stop_transport (bool abort, bool clear_state) return; } - if ((transport_sub_state & PendingDeclickOut) == 0) { if (!(transport_sub_state & StopPendingCapture)) { |