X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_process.cc;h=497fbd4d2e1f437f32484f586300cc58e6f95a28;hb=8a128b33d38172ae525ac798c53bc105bc4e2c64;hp=bd5cc664512b823b0fd597e538982bd05f4c4fe9;hpb=2bf3cf2f8cbe5848adf680639b9cbc339a8a9a22;p=ardour.git diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index bd5cc66451..497fbd4d2e 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -35,18 +35,16 @@ #include "ardour/graph.h" #include "ardour/port.h" #include "ardour/process_thread.h" +#include "ardour/scene_changer.h" #include "ardour/session.h" #include "ardour/slave.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; @@ -86,9 +84,12 @@ Session::process (pframes_t nframes) */ try { - if (!_engine.freewheeling() && Config->get_send_midi_clock() && transport_speed() == 1.0f && midi_clock->has_midi_port()) { - midi_clock->tick (transport_at_start); + if (!_silent && !_engine.freewheeling() && Config->get_send_midi_clock() && (transport_speed() == 1.0f || transport_speed() == 0.0f) && midi_clock->has_midi_port()) { + midi_clock->tick (transport_at_start, nframes); } + + _scene_changer->run (transport_at_start, transport_at_start + nframes); + } catch (...) { /* don't bother with a message */ } @@ -116,9 +117,7 @@ Session::no_roll (pframes_t nframes) _click_io->silence (nframes); } -#ifdef HAVE_LTC ltc_tx_send_time_code_for_cycle (_transport_frame, end_frame, _target_transport_speed, _transport_speed, nframes); -#endif if (_process_graph) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/no-roll\n"); @@ -127,7 +126,7 @@ Session::no_roll (pframes_t nframes) PT_TIMING_CHECK (10); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - if ((*i)->is_hidden()) { + if ((*i)->is_auditioner()) { continue; } @@ -155,11 +154,6 @@ Session::process_routes (pframes_t nframes, bool& need_butler) int declick = get_transport_declick_required(); boost::shared_ptr 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); @@ -172,7 +166,7 @@ Session::process_routes (pframes_t nframes, bool& need_butler) int ret; - if ((*i)->is_hidden()) { + if ((*i)->is_auditioner()) { continue; } @@ -212,7 +206,7 @@ Session::silent_process_routes (pframes_t nframes, bool& need_butler) int ret; - if ((*i)->is_hidden()) { + if ((*i)->is_auditioner()) { continue; } @@ -329,7 +323,7 @@ Session::process_with_events (pframes_t nframes) * and prepare for rolling) */ if (_send_timecode_update) { - send_full_time_code (_transport_frame); + send_full_time_code (_transport_frame, nframes); } if (!process_can_proceed()) { @@ -426,7 +420,9 @@ Session::process_with_events (pframes_t nframes) check_declick_out (); } - _engine.split_cycle (this_nframes); + if (nframes > 0) { + _engine.split_cycle (this_nframes); + } /* now handle this event and all others scheduled for the same time */ @@ -517,7 +513,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 @@ -545,7 +543,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) { @@ -576,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))); @@ -793,9 +793,7 @@ Session::process_without_events (pframes_t nframes) if (!_exporting && _slave) { if (!follow_slave (nframes)) { -#ifdef HAVE_LTC ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame, 0, 0 , nframes); -#endif return; } } @@ -817,9 +815,7 @@ Session::process_without_events (pframes_t nframes) send_midi_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, nframes); } -#ifdef HAVE_LTC ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, _target_transport_speed, _transport_speed, nframes); -#endif framepos_t const stop_limit = compute_stop_limit (); @@ -865,7 +861,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); } } @@ -878,8 +874,8 @@ 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); + if (_monitor_out && auditioner->needs_monitor()) { + _monitor_out->monitor_run (_transport_frame, _transport_frame + nframes, nframes, false); } /* handle pending events */ @@ -1013,7 +1009,7 @@ Session::process_event (SessionEvent* ev) switch (ev->type) { case SessionEvent::SetLoop: - set_play_loop (ev->yes_or_no); + set_play_loop (ev->yes_or_no, ev->speed); break; case SessionEvent::AutoLoop: @@ -1060,6 +1056,15 @@ Session::process_event (SessionEvent* ev) _send_timecode_update = true; break; + case SessionEvent::Skip: + if (Config->get_skip_playback()) { + start_locate (ev->target_frame, true, true, false); + _send_timecode_update = true; + } + remove = false; + del = false; + break; + case SessionEvent::LocateRollLocate: // locate is handled by ::request_roll_at_and_return() _requested_return_frame = ev->target_frame; @@ -1068,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: @@ -1091,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; @@ -1141,6 +1146,10 @@ Session::process_event (SessionEvent* ev) set_play_range (ev->audio_range, (ev->speed == 1.0f)); break; + case SessionEvent::CancelPlayAudioRange: + unset_play_range(); + break; + case SessionEvent::RealTimeOperation: process_rtop (ev); del = false; // other side of RT request needs to clean up @@ -1179,6 +1188,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());