diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-10 13:22:45 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-10 13:22:50 -0400 |
| commit | fa9780ba676e1b128d412d9daf8b51a48b209d90 (patch) | |
| tree | d2761f35c75d76c536bd41152ea0afb1e9d81205 /libs/ardour/session_process.cc | |
| parent | d1e303247b56b4e0b1a9564969723989beaa0290 (diff) | |
subtle changes to accomplish two goals (1) playhead should stop where the user pressed stopped (2) captured regions should end where the playhead ends
Diffstat (limited to 'libs/ardour/session_process.cc')
| -rw-r--r-- | libs/ardour/session_process.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index a9e9e2eb55..497fbd4d2e 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -154,11 +154,6 @@ Session::process_routes (pframes_t nframes, bool& need_butler) int declick = get_transport_declick_required(); boost::shared_ptr<RouteList> r = routes.reader (); - if (transport_sub_state & StopPendingCapture) { - /* force a declick out */ - declick = -1; - } - const framepos_t start_frame = _transport_frame; const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed); @@ -581,7 +576,7 @@ Session::follow_slave (pframes_t nframes) #endif if (_slave->give_slave_full_control_over_transport_speed()) { - set_transport_speed (slave_speed, false, false); + set_transport_speed (slave_speed, 0, false, false); //std::cout << "set speed = " << slave_speed << "\n"; } else { float adjusted_speed = slave_speed + (1.5 * (delta / float(_current_frame_rate))); @@ -1078,7 +1073,7 @@ Session::process_event (SessionEvent* ev) case SessionEvent::SetTransportSpeed: - set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no, ev->third_yes_or_no); + set_transport_speed (ev->speed, ev->target_frame, ev->yes_or_no, ev->second_yes_or_no, ev->third_yes_or_no); break; case SessionEvent::PunchIn: @@ -1101,8 +1096,8 @@ Session::process_event (SessionEvent* ev) case SessionEvent::StopOnce: if (!non_realtime_work_pending()) { - stop_transport (ev->yes_or_no); _clear_event_type (SessionEvent::StopOnce); + stop_transport (ev->yes_or_no); } remove = false; del = false; |