X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_process.cc;h=9a4fabeb6489d0f90c97a5e33d40c2a08b405521;hb=fe39866bba9c1d0cbfb89dcb26235b8f953cc5a4;hp=585d0927f27fd0311817ce4edb749d85d9fab74c;hpb=39becbeb70aa4ab82b963669d87995a32141981c;p=ardour.git diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 585d0927f2..9a4fabeb64 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -25,7 +25,7 @@ #include "pbd/error.h" #include "pbd/enumwriter.h" -#include +#include #include "ardour/audioengine.h" #include "ardour/auditioner.h" @@ -116,6 +116,8 @@ Session::no_roll (pframes_t nframes) _click_io->silence (nframes); } + ltc_tx_send_time_code_for_cycle (_transport_frame, end_frame, _target_transport_speed, _transport_speed, nframes); + if (_process_graph) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/no-roll\n"); _process_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), declick); @@ -341,8 +343,8 @@ Session::process_with_events (pframes_t nframes) if (_transport_speed == 1.0) { frames_moved = (framecnt_t) nframes; } else { - interpolation.set_target_speed (fabs(_target_transport_speed)); - interpolation.set_speed (fabs(_transport_speed)); + interpolation.set_target_speed (_target_transport_speed); + interpolation.set_speed (_transport_speed); frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0); } @@ -513,7 +515,7 @@ Session::follow_slave (pframes_t nframes) slave_speed = 0.0f; } - if (_slave->is_always_synced() || config.get_timecode_source_is_synced()) { + if (_slave->is_always_synced() || Config->get_timecode_source_is_synced()) { /* if the TC source is synced, then we assume that its speed is binary: 0.0 or 1.0 @@ -541,7 +543,7 @@ Session::follow_slave (pframes_t nframes) _slave_state, slave_transport_frame, slave_speed, this_delta, average_slave_delta)); - if (_slave_state == Running && !_slave->is_always_synced() && !config.get_timecode_source_is_synced()) { + if (_slave_state == Running && !_slave->is_always_synced() && !Config->get_timecode_source_is_synced()) { if (_transport_speed != 0.0f) { @@ -583,7 +585,7 @@ Session::follow_slave (pframes_t nframes) } #if 1 - if ((framecnt_t) abs(average_slave_delta) > _slave->resolution()) { + if (!actively_recording() && (framecnt_t) abs(average_slave_delta) > _slave->resolution()) { cerr << "average slave delta greater than slave resolution (" << _slave->resolution() << "), going to silent motion\n"; goto silent_motion; } @@ -653,7 +655,10 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame, } else { - _slave_state = Running; + DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stopped -> running at %1\n", slave_transport_frame)); + + memset (delta_accumulator, 0, sizeof (int32_t) * delta_accumulator_size); + average_slave_delta = 0L; Location* al = _locations->auto_loop_location(); @@ -663,8 +668,10 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame, } if (slave_transport_frame != _transport_frame) { + DEBUG_TRACE (DEBUG::Slave, string_compose ("require locate to run. eng: %1 -> sl: %2\n", _transport_frame, slave_transport_frame)); locate (slave_transport_frame, false, false); } + _slave_state = Running; } break; @@ -713,9 +720,6 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame, cerr << "cannot micro-seek\n"; /* XXX what? */ } - - memset (delta_accumulator, 0, sizeof (int32_t) * delta_accumulator_size); - average_slave_delta = 0L; } } @@ -738,7 +742,7 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame, force_locate (slave_transport_frame, false); } - _slave_state = Stopped; + reset_slave_state(); } } @@ -787,6 +791,7 @@ Session::process_without_events (pframes_t nframes) if (!_exporting && _slave) { if (!follow_slave (nframes)) { + ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame, 0, 0 , nframes); return; } } @@ -799,8 +804,8 @@ Session::process_without_events (pframes_t nframes) if (_transport_speed == 1.0) { frames_moved = (framecnt_t) nframes; } else { - interpolation.set_target_speed (fabs(_target_transport_speed)); - interpolation.set_speed (fabs(_transport_speed)); + interpolation.set_target_speed (_target_transport_speed); + interpolation.set_speed (_transport_speed); frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0); } @@ -808,6 +813,8 @@ Session::process_without_events (pframes_t nframes) send_midi_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, nframes); } + ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, _target_transport_speed, _transport_speed, nframes); + framepos_t const stop_limit = compute_stop_limit (); if (maybe_stop (stop_limit)) { @@ -828,16 +835,6 @@ Session::process_without_events (pframes_t nframes) get_track_statistics (); - /* XXX: I'm not sure whether this is correct, but at least it - matches process_with_events, so that this new frames_moved - is -ve when transport speed is -ve. This means that the - transport position is updated correctly when we are in - reverse. It seems a bit wrong that we're not using the - interpolator to compute this. - */ - - frames_moved = (framecnt_t) floor (_transport_speed * nframes); - if (frames_moved < 0) { decrement_transport_position (-frames_moved); } else { @@ -1015,6 +1012,9 @@ Session::process_event (SessionEvent* ev) case SessionEvent::AutoLoop: if (play_loop) { + /* roll after locate, do not flush, set "with loop" + true only if we are seamless looping + */ start_locate (ev->target_frame, true, false, Config->get_seamless_loop()); } remove = false; @@ -1034,10 +1034,10 @@ Session::process_event (SessionEvent* ev) case SessionEvent::Locate: if (ev->yes_or_no) { - // cerr << "forced locate to " << ev->target_frame << endl; + /* args: do not roll after locate, do flush, not with loop */ locate (ev->target_frame, false, true, false); } else { - // cerr << "soft locate to " << ev->target_frame << endl; + /* args: do not roll after locate, do flush, not with loop */ start_locate (ev->target_frame, false, true, false); } _send_timecode_update = true; @@ -1045,10 +1045,10 @@ Session::process_event (SessionEvent* ev) case SessionEvent::LocateRoll: if (ev->yes_or_no) { - // cerr << "forced locate to+roll " << ev->target_frame << endl; + /* args: roll after locate, do flush, not with loop */ locate (ev->target_frame, true, true, false); } else { - // cerr << "soft locate to+roll " << ev->target_frame << endl; + /* args: roll after locate, do flush, not with loop */ start_locate (ev->target_frame, true, true, false); } _send_timecode_update = true; @@ -1062,7 +1062,7 @@ Session::process_event (SessionEvent* ev) case SessionEvent::SetTransportSpeed: - set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no); + set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no, ev->third_yes_or_no); break; case SessionEvent::PunchIn: @@ -1101,6 +1101,7 @@ Session::process_event (SessionEvent* ev) break; case SessionEvent::RangeLocate: + /* args: roll after locate, do flush, not with loop */ start_locate (ev->target_frame, true, true, false); remove = false; del = false; @@ -1115,6 +1116,7 @@ Session::process_event (SessionEvent* ev) break; case SessionEvent::SetSyncSource: + DEBUG_TRACE (DEBUG::Slave, "seen request for new slave\n"); use_sync_source (ev->slave); break; @@ -1171,6 +1173,11 @@ Session::compute_stop_limit () const if (!Config->get_stop_at_session_end ()) { return max_framepos; } + + if (_slave) { + return max_framepos; + } + bool const punching_in = (config.get_punch_in () && _locations->auto_punch_location()); bool const punching_out = (config.get_punch_out () && _locations->auto_punch_location());