X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_process.cc;h=067a91da48f45449933c1960cdc3482fe7681e3e;hb=2b80aee20a01f70afe9997fd39c4ca8d19c8caf8;hp=89dd83b9c694de4145e5bcc826925ba4b70787a3;hpb=b5478a8a2b09793fe94c2a8836daec2b8f24f0a5;p=ardour.git diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 89dd83b9c6..067a91da48 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -25,25 +25,28 @@ #include "pbd/error.h" #include "pbd/enumwriter.h" -#include +#include -#include "ardour/ardour.h" #include "ardour/audioengine.h" #include "ardour/auditioner.h" #include "ardour/butler.h" +#include "ardour/cycle_timer.h" #include "ardour/debug.h" +#include "ardour/graph.h" +#include "ardour/port.h" #include "ardour/process_thread.h" #include "ardour/session.h" #include "ardour/slave.h" -#include "ardour/timestamps.h" -#include "ardour/graph.h" -#include "ardour/audio_port.h" +#include "ardour/ticker.h" +#include "ardour/types.h" #include "midi++/manager.h" #include "midi++/mmc.h" #include "i18n.h" +#include + using namespace ARDOUR; using namespace PBD; using namespace std; @@ -55,7 +58,7 @@ using namespace std; void Session::process (pframes_t nframes) { - MIDI::Manager::instance()->cycle_start(nframes); + framepos_t transport_at_start = _transport_frame; _silent = false; @@ -76,17 +79,21 @@ Session::process (pframes_t nframes) _engine.main_thread()->drop_buffers (); - // the ticker is for sending time information like MidiClock - framepos_t transport_frames = transport_frame(); - Timecode::BBT_Time transport_bbt; - bbt_time(transport_frames, transport_bbt); - Timecode::Time transport_timecode; - timecode_time(transport_frames, transport_timecode); - tick (transport_frames, transport_bbt, transport_timecode); /* EMIT SIGNAL */ + /* deliver MIDI clock. Note that we need to use the transport frame + * position at the start of process(), not the value at the end of + * it. We may already have ticked() because of a transport state + * change, for example. + */ - SendFeedback (); /* EMIT SIGNAL */ + try { + if (!_engine.freewheeling() && Config->get_send_midi_clock() && transport_speed() == 1.0f && midi_clock->has_midi_port()) { + midi_clock->tick (transport_at_start); + } + } catch (...) { + /* don't bother with a message */ + } - MIDI::Manager::instance()->cycle_end(); + SendFeedback (); /* EMIT SIGNAL */ } int @@ -98,22 +105,27 @@ Session::fail_roll (pframes_t nframes) int Session::no_roll (pframes_t nframes) { + PT_TIMING_CHECK (4); + framepos_t end_frame = _transport_frame + nframes; // FIXME: varispeed + no_roll ?? int ret = 0; - bool declick = get_transport_declick_required(); + int declick = get_transport_declick_required(); boost::shared_ptr r = routes.reader (); if (_click_io) { _click_io->silence (nframes); } - if (_process_graph->threads_in_use() > 0) { + 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); } else { + PT_TIMING_CHECK (10); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - if ((*i)->is_hidden()) { + if ((*i)->is_auditioner()) { continue; } @@ -125,11 +137,16 @@ Session::no_roll (pframes_t nframes) break; } } + PT_TIMING_CHECK (11); } + PT_TIMING_CHECK (5); return ret; } +/** @param need_butler to be set to true by this method if it needs the butler, + * otherwise it must be left alone. + */ int Session::process_routes (pframes_t nframes, bool& need_butler) { @@ -143,12 +160,8 @@ Session::process_routes (pframes_t nframes, bool& need_butler) const framepos_t start_frame = _transport_frame; const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed); - - /* XXX this is hack to force use of the graph even if we are only - using 1 thread. its needed because otherwise when we remove - tracks, the graph never gets updated. - */ - if (1 || _process_graph->threads_in_use() > 0) { + + if (_process_graph) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n"); _process_graph->process_routes (nframes, start_frame, end_frame, declick, need_butler); } else { @@ -157,22 +170,31 @@ Session::process_routes (pframes_t nframes, bool& need_butler) int ret; - if ((*i)->is_hidden()) { + if ((*i)->is_auditioner()) { continue; } (*i)->set_pending_declick (declick); - if ((ret = (*i)->roll (nframes, start_frame, end_frame, declick, need_butler)) < 0) { + bool b = false; + + if ((ret = (*i)->roll (nframes, start_frame, end_frame, declick, b)) < 0) { stop_transport (); return -1; } + + if (b) { + need_butler = true; + } } } return 0; } +/** @param need_butler to be set to true by this method if it needs the butler, + * otherwise it must be left alone. + */ int Session::silent_process_routes (pframes_t nframes, bool& need_butler) { @@ -181,25 +203,27 @@ Session::silent_process_routes (pframes_t nframes, bool& need_butler) const framepos_t start_frame = _transport_frame; const framepos_t end_frame = _transport_frame + lrintf(nframes * _transport_speed); - /* XXX this is hack to force use of the graph even if we are only - using 1 thread. its needed because otherwise when we remove - tracks, the graph never gets updated. - */ - if (1 || _process_graph->threads_in_use() > 0) { + if (_process_graph) { _process_graph->silent_process_routes (nframes, start_frame, end_frame, need_butler); } else { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { int ret; - if ((*i)->is_hidden()) { + if ((*i)->is_auditioner()) { continue; } - if ((ret = (*i)->silent_roll (nframes, start_frame, end_frame, need_butler)) < 0) { + bool b = false; + + if ((ret = (*i)->silent_roll (nframes, start_frame, end_frame, b)) < 0) { stop_transport (); return -1; } + + if (b) { + need_butler = true; + } } } @@ -237,6 +261,8 @@ Session::get_track_statistics () void Session::process_with_events (pframes_t nframes) { + PT_TIMING_CHECK (3); + SessionEvent* ev; pframes_t this_nframes; framepos_t end_frame; @@ -317,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); } @@ -489,7 +515,9 @@ 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() && (dynamic_cast(_slave)) != 0) + ) { /* if the TC source is synced, then we assume that its speed is binary: 0.0 or 1.0 @@ -517,7 +545,9 @@ 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() && (dynamic_cast(_slave)) != 0) + ) { if (_transport_speed != 0.0f) { @@ -559,7 +589,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; } @@ -629,7 +659,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(); @@ -639,8 +672,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; @@ -689,9 +724,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; } } @@ -714,7 +746,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(); } } @@ -763,6 +795,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; } } @@ -775,8 +808,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); } @@ -784,6 +817,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)) { @@ -804,16 +839,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 { @@ -838,7 +863,7 @@ Session::process_audition (pframes_t nframes) boost::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - if (!(*i)->is_hidden()) { + if (!(*i)->is_auditioner()) { (*i)->silence (nframes); } } @@ -852,7 +877,7 @@ Session::process_audition (pframes_t nframes) /* if using a monitor section, run it because otherwise we don't hear anything */ if (auditioner->needs_monitor()) { - _monitor_out->passthru (_transport_frame, _transport_frame + nframes, nframes, false); + _monitor_out->monitor_run (_transport_frame, _transport_frame + nframes, nframes, false); } /* handle pending events */ @@ -991,18 +1016,32 @@ 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; del = false; break; + case SessionEvent::AutoLoopDeclick: + if (play_loop) { + /* Request a declick fade-out and a fade-in; the fade-out will happen + at the end of the loop, and the fade-in at the start. + */ + transport_sub_state |= (PendingLoopDeclickOut | PendingLoopDeclickIn); + } + remove = false; + del = false; + break; + 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; @@ -1010,10 +1049,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; @@ -1027,7 +1066,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: @@ -1066,6 +1105,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; @@ -1080,6 +1120,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; @@ -1136,6 +1177,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());