X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_transport.cc;h=f1486ada78144abc89636c940f4d92d9f0b4a5e0;hb=a6af411af7ade161483ae688f5e1868d481a8fce;hp=ea9f5d28dd6ee97e2beebb8e8cf65f8a95920c43;hpb=3131ab8bbd9f57b6c59ff0a13460db634d5dafee;p=ardour.git diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index ea9f5d28dd..f1486ada78 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -42,6 +42,7 @@ #include "ardour/debug.h" #include "ardour/location.h" #include "ardour/profile.h" +#include "ardour/scene_changer.h" #include "ardour/session.h" #include "ardour/slave.h" #include "ardour/operations.h" @@ -108,7 +109,7 @@ void Session::request_transport_speed (double speed, bool as_default) { SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, 0, speed); - ev->third_yes_or_no = true; + ev->third_yes_or_no = as_default; // as_default DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport speed = %1 as default = %2\n", speed, as_default)); queue_event (ev); } @@ -138,8 +139,8 @@ Session::request_track_speed (Track* tr, double speed) void Session::request_stop (bool abort, bool clear_state) { - SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0, abort, clear_state); - DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, abort = %1, clear state = %2\n", abort, clear_state)); + SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, audible_frame(), 0.0, abort, clear_state); + DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, audible %3 transport %4 abort = %1, clear state = %2\n", abort, clear_state, audible_frame(), _transport_frame)); queue_event (ev); } @@ -162,6 +163,12 @@ Session::force_locate (framepos_t target_frame, bool with_roll) void Session::request_play_loop (bool yn, bool change_transport_roll) { + if (_slave && yn) { + // don't attempt to loop when not using Internal Transport + // see also gtk2_ardour/ardour_ui_options.cc parameter_changed() + return; + } + SessionEvent* ev; Location *location = _locations->auto_loop_location(); double target_speed; @@ -226,6 +233,14 @@ Session::request_play_range (list* range, bool leave_rolling) queue_event (ev); } +void +Session::request_cancel_play_range () +{ + SessionEvent* ev = new SessionEvent (SessionEvent::CancelPlayAudioRange, SessionEvent::Add, SessionEvent::Immediate, 0, 0); + queue_event (ev); +} + + void Session::realtime_stop (bool abort, bool clear_state) { @@ -249,26 +264,11 @@ Session::realtime_stop (bool abort, bool clear_state) (*i)->realtime_handle_transport_stopped (); } - if (actively_recording()) { - - /* move the transport position back to where the - request for a stop was noticed. we rolled - past that point to pick up delayed input (and/or to delick) - */ - - if (worst_playback_latency() > current_block_size) { - /* 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_input_latency() - current_block_size)); - } else { - decrement_transport_position (current_block_size); - } + DEBUG_TRACE (DEBUG::Transport, string_compose ("stop complete, auto-return scheduled for return to %1\n", _requested_return_frame)); - /* the duration change is not guaranteed to have happened, but is likely */ + /* the duration change is not guaranteed to have happened, but is likely */ - todo = PostTransportWork (todo | PostTransportDuration); - } + todo = PostTransportWork (todo | PostTransportDuration); if (abort) { todo = PostTransportWork (todo | PostTransportAbort); @@ -289,6 +289,10 @@ Session::realtime_stop (bool abort, bool clear_state) /* if we're going to clear loop state, then force disabling record BUT only if we're not doing latched rec-enable */ disable_record (true, (!Config->get_latched_record_enable() && clear_state)); + if (clear_state && !Config->get_loop_is_mode()) { + unset_play_loop (); + } + reset_slave_state (); _transport_speed = 0; @@ -316,16 +320,57 @@ Session::realtime_locate () void Session::butler_transport_work () { + /* Note: this function executes in the butler thread context */ + restart: bool finished; PostTransportWork ptw; boost::shared_ptr r = routes.reader (); + uint64_t before; int on_entry = g_atomic_int_get (&_butler->should_do_transport_work); finished = true; ptw = post_transport_work(); - DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler transport work, todo = %1\n", enum_2_string (ptw))); + DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler transport work, todo = %1 at %2\n", enum_2_string (ptw), (before = g_get_monotonic_time()))); + + + if (ptw & PostTransportLocate) { + + if (get_play_loop() && !Config->get_seamless_loop()) { + + DEBUG_TRACE (DEBUG::Butler, "flush loop recording fragment to disk\n"); + + /* this locate might be happening while we are + * loop recording. + * + * Non-seamless looping will require a locate (below) that + * will reset capture buffers and throw away data. + * + * Rather than first find all tracks and see if they + * have outstanding data, just do a flush anyway. It + * may be cheaper this way anyway, and is certainly + * more accurate. + */ + + bool more_disk_io_to_do = false; + uint32_t errors = 0; + + do { + more_disk_io_to_do = _butler->flush_tracks_to_disk_after_locate (r, errors); + + if (errors) { + break; + } + + if (more_disk_io_to_do) { + continue; + } + + } while (false); + + } + } if (ptw & PostTransportAdjustPlaybackBuffering) { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { @@ -390,6 +435,7 @@ Session::butler_transport_work () } if (ptw & PostTransportLocate) { + DEBUG_TRACE (DEBUG::Transport, "nonrealtime locate invoked from BTW\n"); non_realtime_locate (); } @@ -415,7 +461,7 @@ Session::butler_transport_work () g_atomic_int_dec_and_test (&_butler->should_do_transport_work); - DEBUG_TRACE (DEBUG::Transport, X_("Butler transport work all done\n")); + DEBUG_TRACE (DEBUG::Transport, string_compose (X_("Butler transport work all done after %1 usecs\n"), g_get_monotonic_time() - before)); DEBUG_TRACE (DEBUG::Transport, X_(string_compose ("Frame %1\n", _transport_frame))); } @@ -451,11 +497,46 @@ Session::non_realtime_overwrite (int on_entry, bool& finished) void Session::non_realtime_locate () { + DEBUG_TRACE (DEBUG::Transport, string_compose ("locate tracks to %1\n", _transport_frame)); + + if (Config->get_loop_is_mode() && get_play_loop()) { + + Location *loc = _locations->auto_loop_location(); + + if (!loc || (_transport_frame < loc->start() || _transport_frame >= loc->end())) { + /* jumped out of loop range: stop tracks from looping, + but leave loop (mode) enabled. + */ + set_track_loop (false); + + } else if (loc && Config->get_seamless_loop() && + ((loc->start() <= _transport_frame) || + (loc->end() > _transport_frame) ) ) { + + /* jumping to start of loop. This might have been done before but it is + * idempotent and cheap. Doing it here ensures that when we start playback + * outside the loop we still flip tracks into the magic seamless mode + * when needed. + */ + set_track_loop (true); + + } else if (loc) { + set_track_loop (false); + } + + } else { + + /* no more looping .. should have been noticed elsewhere */ + } + + boost::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { (*i)->non_realtime_locate (_transport_frame); } + _scene_changer->locate (_transport_frame); + /* XXX: it would be nice to generate the new clicks here (in the non-RT thread) rather than clearing them so that the RT thread has to spend time constructing them (in Session::click). @@ -463,6 +544,105 @@ Session::non_realtime_locate () clear_clicks (); } +#ifdef USE_TRACKS_CODE_FEATURES +bool +Session::select_playhead_priority_target (framepos_t& jump_to) +{ + jump_to = -1; + + AutoReturnTarget autoreturn = Config->get_auto_return_target_list (); + + if (!autoreturn) { + return false; + } + + if (Profile->get_trx() && transport_rolling() ) { + // We're playing, so do nothing. + // Next stop will put us where we need to be. + return false; + } + + /* Note that the order of checking each AutoReturnTarget flag defines + the priority each flag. + + Ardour/Mixbus: Last Locate + Range Selection + Loop Range + Region Selection + + Tracks: Range Selection + Loop Range + Region Selection + Last Locate + */ + + if (autoreturn & RangeSelectionStart) { + if (!_range_selection.empty()) { + jump_to = _range_selection.from; + } else { + if (transport_rolling ()) { + /* Range selection no longer exists, but we're playing, + so do nothing. Next stop will put us where + we need to be. + */ + return false; + } + } + } + + if (jump_to < 0 && (autoreturn & Loop) && get_play_loop()) { + /* don't try to handle loop play when synced to JACK */ + + if (!synced_to_engine()) { + Location *location = _locations->auto_loop_location(); + + if (location) { + jump_to = location->start(); + + if (Config->get_seamless_loop()) { + /* need to get track buffers reloaded */ + set_track_loop (true); + } + } + } + } + + if (jump_to < 0 && (autoreturn & RegionSelectionStart)) { + if (!_object_selection.empty()) { + jump_to = _object_selection.from; + } + } + + if (jump_to < 0 && (autoreturn & LastLocate)) { + jump_to = _last_roll_location; + } + + return jump_to >= 0; +} +#else + +bool +Session::select_playhead_priority_target (framepos_t& jump_to) +{ + if (config.get_external_sync() || !config.get_auto_return()) { + return false; + } + + jump_to = _last_roll_location; + return jump_to >= 0; +} + +#endif + +void +Session::follow_playhead_priority () +{ + framepos_t target; + + if (select_playhead_priority_target (target)) { + request_locate (target); + } +} void Session::non_realtime_stop (bool abort, int on_entry, bool& finished) @@ -531,6 +711,11 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) if (did_record) { commit_reversible_command (); + /* increase take name */ + if (config.get_track_name_take () && !config.get_take_name ().empty()) { + string newname = config.get_take_name(); + config.set_take_name(bump_name_number (newname)); + } } if (_engine.running()) { @@ -541,8 +726,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) update_latency_compensation (); } - bool const auto_return_enabled = - (!config.get_external_sync() && config.get_auto_return()); + bool const auto_return_enabled = (!config.get_external_sync() && (Config->get_auto_return_target_list() || abort)); if (auto_return_enabled || (ptw & PostTransportLocate) || @@ -568,40 +752,17 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) do_locate = true; } else { - if (config.get_auto_return()) { - - if (play_loop) { - - /* don't try to handle loop play when synced to JACK */ - - if (!synced_to_engine()) { - - Location *location = _locations->auto_loop_location(); + framepos_t jump_to; - if (location != 0) { - _transport_frame = location->start(); - } else { - _transport_frame = _last_roll_location; - } - do_locate = true; - } + if (select_playhead_priority_target (jump_to)) { - } else if (_play_range) { + _transport_frame = jump_to; + do_locate = true; - /* return to start of range */ + } else if (abort) { - if (!current_audio_range.empty()) { - _transport_frame = current_audio_range.front().start; - do_locate = true; - } - - } else { - - /* regular auto-return */ - - _transport_frame = _last_roll_location; - do_locate = true; - } + _transport_frame = _last_roll_location; + do_locate = true; } } @@ -649,14 +810,14 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) if (_engine.connected() && !_engine.freewheeling()) { // need to queue this in the next RT cycle _send_timecode_update = true; - + if (!dynamic_cast(_slave)) { - _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop)); + send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop)); /* This (::non_realtime_stop()) gets called by main process thread, which will lead to confusion when calling AsyncMIDIPort::write(). - + Something must be done. XXX */ send_mmc_locate (_transport_frame); @@ -672,9 +833,8 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) * save state only if there's no slave or if it's not yet locked. */ if (!_slave || !_slave->locked()) { - DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: pending save\n")); - /* capture start has been changed, so save pending state */ - save_state ("", true); + DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: requests save\n")); + SaveSessionRequested (_current_snapshot_name); saved = true; } } @@ -686,7 +846,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) /* save the current state of things if appropriate */ if (did_record && !saved) { - save_state (_current_snapshot_name); + SaveSessionRequested (_current_snapshot_name); } if (ptw & PostTransportStop) { @@ -730,8 +890,10 @@ Session::check_declick_out () start_locate (pending_locate_frame, pending_locate_roll, pending_locate_flush); transport_sub_state &= ~(PendingDeclickOut|PendingLocate); } else { - stop_transport (pending_abort); - transport_sub_state &= ~(PendingDeclickOut|PendingLocate); + if (!(transport_sub_state & StopPendingCapture)) { + stop_transport (pending_abort); + transport_sub_state &= ~(PendingDeclickOut|PendingLocate); + } } } else if (transport_sub_state & PendingLoopDeclickOut) { @@ -743,16 +905,36 @@ Session::check_declick_out () void Session::unset_play_loop () { - play_loop = false; - clear_events (SessionEvent::AutoLoop); - clear_events (SessionEvent::AutoLoopDeclick); + if (play_loop) { + play_loop = false; + clear_events (SessionEvent::AutoLoop); + clear_events (SessionEvent::AutoLoopDeclick); + set_track_loop (false); + + + if (Config->get_seamless_loop()) { + /* likely need to flush track buffers: this will locate us to wherever we are */ + add_post_transport_work (PostTransportLocate); + _butler->schedule_transport_work (); + } + } +} + +void +Session::set_track_loop (bool yn) +{ + Location* loc = _locations->auto_loop_location (); + + if (!loc) { + yn = false; + } - // set all tracks to NOT use internal looping boost::shared_ptr rl = routes.reader (); + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); if (tr && !tr->hidden()) { - tr->set_loop (0); + tr->set_loop (yn ? loc : 0); } } } @@ -780,30 +962,24 @@ Session::set_play_loop (bool yn, double speed) if (yn) { play_loop = true; + have_looped = false; if (loc) { unset_play_range (); if (Config->get_seamless_loop()) { - // set all tracks to use internal looping - boost::shared_ptr rl = routes.reader (); - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); - if (tr && !tr->hidden()) { - tr->set_loop (loc); - } - } - } - else { - // set all tracks to NOT use internal looping - boost::shared_ptr rl = routes.reader (); - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); - if (tr && !tr->hidden()) { - tr->set_loop (0); - } + if (!Config->get_loop_is_mode()) { + /* set all tracks to use internal looping */ + set_track_loop (true); + } else { + /* we will do this in the locate to the start OR when we hit the end + * of the loop for the first time + */ } + } else { + /* set all tracks to NOT use internal looping */ + set_track_loop (false); } /* Put the delick and loop events in into the event list. The declick event will @@ -828,11 +1004,11 @@ Session::set_play_loop (bool yn, double speed) rolling, do not locate to loop start. */ if (!transport_rolling() && (speed != 0.0)) { - start_locate (loc->start(), true, true, false, Config->get_seamless_loop()); + start_locate (loc->start(), true, true, false, true); } } else { if (speed != 0.0) { - start_locate (loc->start(), true, true, false, Config->get_seamless_loop()); + start_locate (loc->start(), true, true, false, true); } } } @@ -856,8 +1032,13 @@ Session::flush_all_inserts () } void -Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force) +Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_loop_enabled, bool force) { + if (target_frame < 0) { + error << _("Locate called for negative sample position - ignored") << endmsg; + return; + } + if (synced_to_engine()) { double sp; @@ -872,7 +1053,7 @@ Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush, will use the incorrect _transport_frame and report an old and incorrect time to Jack transport */ - locate (target_frame, with_roll, with_flush, with_loop, force); + locate (target_frame, with_roll, with_flush, for_loop_enabled, force); } /* tell JACK to change transport position, and we will @@ -888,7 +1069,7 @@ Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush, } } else { - locate (target_frame, with_roll, with_flush, with_loop, force); + locate (target_frame, with_roll, with_flush, for_loop_enabled, force); } } @@ -916,30 +1097,38 @@ Session::micro_locate (framecnt_t distance) /** @param with_mmc true to send a MMC locate command when the locate is done */ void -Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_seamless_loop, bool force, bool with_mmc) +Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_loop_enabled, bool force, bool with_mmc) { + bool need_butler = false; + /* Locates for seamless looping are fairly different from other * locates. They assume that the diskstream buffers for each track * already have the correct data in them, and thus there is no need to * actually tell the tracks to locate. What does need to be done, * though, is all the housekeeping that is associated with non-linear - * changes in the value of _transport_frame. + * changes in the value of _transport_frame. */ - if (actively_recording() && !for_seamless_loop) { - return; - } + DEBUG_TRACE (DEBUG::Transport, string_compose ("rt-locate to %1, roll %2 flush %3 loop-enabled %4 force %5 mmc %6\n", + target_frame, with_roll, with_flush, for_loop_enabled, force, with_mmc)); + + if (!force && _transport_frame == target_frame && !loop_changing && !for_loop_enabled) { + + /* already at the desired position. Not forced to locate, + the loop isn't changing, so unless we're told to + start rolling also, there's nothing to do but + tell the world where we are (again). + */ - if (!force && _transport_frame == target_frame && !loop_changing && !for_seamless_loop) { if (with_roll) { - set_transport_speed (1.0, false); + set_transport_speed (1.0, 0, false); } loop_changing = false; Located (); /* EMIT SIGNAL */ return; } - if (_transport_speed && !for_seamless_loop) { + if (_transport_speed && !(for_loop_enabled && Config->get_seamless_loop())) { /* Schedule a declick. We'll be called again when its done. We only do it this way for ordinary locates, not those due to **seamless** loops. @@ -973,7 +1162,8 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool bool transport_was_stopped = !transport_rolling(); - if (transport_was_stopped && (!auto_play_legal || !config.get_auto_play()) && !with_roll && !(synced_to_engine() && play_loop)) { + if (!transport_was_stopped && (!auto_play_legal || !config.get_auto_play()) && !with_roll && !(synced_to_engine() && play_loop) && + (!Profile->get_trx() || !(config.get_external_sync() && !synced_to_engine()))) { realtime_stop (false, true); // XXX paul - check if the 2nd arg is really correct transport_was_stopped = true; } else { @@ -981,7 +1171,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool realtime_locate (); } - if (force || !for_seamless_loop || loop_changing) { + if (force || !for_loop_enabled || loop_changing) { PostTransportWork todo = PostTransportLocate; @@ -990,7 +1180,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool } add_post_transport_work (todo); - _butler->schedule_transport_work (); + need_butler = true; } else { @@ -1026,31 +1216,49 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool Location* al = _locations->auto_loop_location(); if (al) { - if (_transport_frame < al->start() || _transport_frame > al->end()) { + if (_transport_frame < al->start() || _transport_frame >= al->end()) { // located outside the loop: cancel looping directly, this is called from event handling context + have_looped = false; + if (!Config->get_loop_is_mode()) { set_play_loop (false, _transport_speed); + } else { + if (Config->get_seamless_loop()) { + /* this will make the non_realtime_locate() in the butler + which then causes seek() in tracks actually do the right + thing. + */ + set_track_loop (false); + } } - + } else if (_transport_frame == al->start()) { // located to start of loop - this is looping, basically - if (for_seamless_loop) { + if (!have_looped) { + /* first time */ + if (_last_roll_location != al->start()) { + /* didn't start at loop start - playback must have + * started before loop since we've now hit the loop + * end. + */ + add_post_transport_work (PostTransportLocate); + need_butler = true; + } + + } - // this is only necessary for seamless looping - - boost::shared_ptr rl = routes.reader(); + boost::shared_ptr rl = routes.reader(); - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); - if (tr && tr->record_enabled ()) { - // tell it we've looped, so it can deal with the record state - tr->transport_looped (_transport_frame); - } + if (tr && tr->record_enabled ()) { + // tell it we've looped, so it can deal with the record state + tr->transport_looped (_transport_frame); } } @@ -1060,6 +1268,10 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool } } + if (need_butler) { + _butler->schedule_transport_work (); + } + loop_changing = false; _send_timecode_update = true; @@ -1077,9 +1289,9 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool * @param speed New speed */ void -Session::set_transport_speed (double speed, bool abort, bool clear_state, bool as_default) +Session::set_transport_speed (double speed, framepos_t destination_frame, bool abort, bool clear_state, bool as_default) { - DEBUG_TRACE (DEBUG::Transport, string_compose ("@ %5 Set transport speed to %1, abort = %2 clear_state = %3, current = %4 as_default %6\n", + DEBUG_TRACE (DEBUG::Transport, string_compose ("@ %5 Set transport speed to %1, abort = %2 clear_state = %3, current = %4 as_default %6\n", speed, abort, clear_state, _transport_speed, _transport_frame, as_default)); if (_transport_speed == speed) { @@ -1091,7 +1303,7 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a if (actively_recording() && speed != 1.0 && speed != 0.0) { /* no varispeed during recording */ - DEBUG_TRACE (DEBUG::Transport, string_compose ("No varispeed during recording cur_speed %1, frame %2\n", + DEBUG_TRACE (DEBUG::Transport, string_compose ("No varispeed during recording cur_speed %1, frame %2\n", _transport_speed, _transport_frame)); return; } @@ -1126,24 +1338,35 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a } _engine.transport_stop (); } else { - stop_transport (abort); - } + bool const auto_return_enabled = (!config.get_external_sync() && (Config->get_auto_return_target_list() || abort)); - if (!Config->get_loop_is_mode()) { - unset_play_loop (); + if (!auto_return_enabled) { + _requested_return_frame = destination_frame; + } + + stop_transport (abort); } } else if (transport_stopped() && speed == 1.0) { - + if (as_default) { + _default_transport_speed = speed; + } /* we are stopped and we want to start rolling at speed 1 */ if (Config->get_loop_is_mode() && play_loop) { Location *location = _locations->auto_loop_location(); - + if (location != 0) { if (_transport_frame != location->start()) { + + if (Config->get_seamless_loop()) { + /* force tracks to do their thing */ + set_track_loop (true); + } + /* jump to start and then roll from there */ + request_locate (location->start(), true); return; } @@ -1192,7 +1415,7 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a PostTransportWork todo = PostTransportWork (0); - if ((_transport_speed && speed * _transport_speed < 0.0) || (_last_transport_speed * speed < 0.0) || (_last_transport_speed == 0.0f && speed < 0.0f)) { + if ((_transport_speed && speed * _transport_speed < 0.0) || (_last_transport_speed * speed < 0.0) || (_last_transport_speed == 0.0 && speed < 0.0)) { todo = PostTransportWork (todo | PostTransportReverse); _last_roll_or_reversal_location = _transport_frame; } @@ -1218,7 +1441,28 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a } DEBUG_TRACE (DEBUG::Transport, string_compose ("send TSC3 with speed = %1\n", _transport_speed)); - TransportStateChange (); /* EMIT SIGNAL */ + + /* throttle signal emissions. + * when slaved [_last]_transport_speed + * usually changes every cycle (tiny amounts due to DLL). + * Emitting a signal every cycle is overkill and unwarranted. + * + * Using _last_transport_speed is not acceptable, + * since it allows for large changes over a long period + * of time. Hence we introduce a dedicated variable to keep track + * + * The 0.2% dead-zone is somewhat arbitrary. Main use-case + * for TransportStateChange() here is the ShuttleControl display. + */ + if (fabs (_signalled_varispeed - speed) > .002 + // still, signal hard changes to 1.0 and 0.0: + || ( speed == 1.0 && _signalled_varispeed != 1.0) + || ( speed == 0.0 && _signalled_varispeed != 0.0) + ) + { + TransportStateChange (); /* EMIT SIGNAL */ + _signalled_varispeed = speed; + } } } @@ -1231,59 +1475,81 @@ Session::stop_transport (bool abort, bool clear_state) return; } - if (actively_recording() && !(transport_sub_state & StopPendingCapture) && worst_input_latency() > current_block_size) { + DEBUG_TRACE (DEBUG::Transport, string_compose ("stop_transport, declick required? %1\n", get_transport_declick_required())); + + if (!get_transport_declick_required()) { + + /* stop has not yet been scheduled */ boost::shared_ptr rl = routes.reader(); + framepos_t stop_target = audible_frame(); + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); if (tr) { - tr->prepare_to_stop (_transport_frame); + tr->prepare_to_stop (_transport_frame, stop_target); } } - /* we need to capture the audio that has still not yet been received by the system - at the time the stop is requested, so we have to roll past that time. + SubState new_bits; - we want to declick before stopping, so schedule the autostop for one - block before the actual end. we'll declick in the subsequent block, - and then we'll really be stopped. - */ + if (actively_recording() && /* we are recording */ + worst_input_latency() > current_block_size) { /* input latency exceeds block size, so simple 1 cycle delay before stop is not enough */ - DEBUG_TRACE (DEBUG::Transport, string_compose ("stop transport requested @ %1, scheduled for + %2 - %3 = %4, abort = %5\n", - _transport_frame, _worst_input_latency, current_block_size, - _transport_frame - _worst_input_latency - current_block_size, - abort)); + /* we need to capture the audio that is still somewhere in the pipeline between + wherever it was generated and the process callback. This means that even though + the user (or something else) has asked us to stop, we have to roll + past this point and then reset the playhead/transport location to + the position at which the stop was requested. - SessionEvent *ev = new SessionEvent (SessionEvent::StopOnce, SessionEvent::Replace, - _transport_frame + _worst_input_latency - current_block_size, - 0, 0, abort); + we still need playback to "stop" now, however, which is why we schedule + a declick below. + */ - merge_event (ev); - transport_sub_state |= StopPendingCapture; - pending_abort = abort; - return; - } + DEBUG_TRACE (DEBUG::Transport, string_compose ("stop transport requested @ %1, scheduled for + %2 = %3, abort = %4\n", + _transport_frame, _worst_input_latency, + _transport_frame + _worst_input_latency, + abort)); - if ((transport_sub_state & PendingDeclickOut) == 0) { + SessionEvent *ev = new SessionEvent (SessionEvent::StopOnce, SessionEvent::Replace, + _transport_frame + _worst_input_latency, + 0, 0, abort); - if (!(transport_sub_state & StopPendingCapture)) { - boost::shared_ptr rl = routes.reader(); - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); - if (tr) { - tr->prepare_to_stop (_transport_frame); - } - } + merge_event (ev); + + /* request a declick at the start of the next process cycle() so that playback ceases. + It will remain silent until we actually stop (at the StopOnce event somewhere in + the future). The extra flag (StopPendingCapture) is set to ensure that check_declick_out() + does not stop the transport too early. + */ + new_bits = SubState (PendingDeclickOut|StopPendingCapture); + + } else { + + /* Not recording, schedule a declick in the next process() cycle and then stop at its end */ + + new_bits = PendingDeclickOut; + DEBUG_TRACE (DEBUG::Transport, string_compose ("stop scheduled for next process cycle @ %1\n", _transport_frame)); } - transport_sub_state |= PendingDeclickOut; /* we'll be called again after the declick */ + transport_sub_state = SubState (transport_sub_state|new_bits); pending_abort = abort; + return; - } - realtime_stop (abort, clear_state); - _butler->schedule_transport_work (); + } else { + + DEBUG_TRACE (DEBUG::Transport, "time to actually stop\n"); + + /* declick was scheduled, but we've been called again, which means it is really time to stop + + XXX: we should probably split this off into its own method and call it explicitly. + */ + + realtime_stop (abort, clear_state); + _butler->schedule_transport_work (); + } } /** Called from the process thread */ @@ -1335,7 +1601,7 @@ Session::start_transport () Timecode::Time time; timecode_time_subframes (_transport_frame, time); if (!dynamic_cast(_slave)) { - _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay)); + send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay)); } } @@ -1400,6 +1666,20 @@ Session::reset_rf_scale (framecnt_t motion) } } +void +Session::mtc_status_changed (bool yn) +{ + g_atomic_int_set (&_mtc_active, yn); + MTCSyncStateChanged( yn ); +} + +void +Session::ltc_status_changed (bool yn) +{ + g_atomic_int_set (&_ltc_active, yn); + LTCSyncStateChanged( yn ); +} + void Session::use_sync_source (Slave* new_slave) { @@ -1412,8 +1692,32 @@ Session::use_sync_source (Slave* new_slave) delete _slave; _slave = new_slave; + MTC_Slave* mtc_slave = dynamic_cast(_slave); + if (mtc_slave) { + mtc_slave->ActiveChanged.connect_same_thread (mtc_status_connection, boost::bind (&Session::mtc_status_changed, this, _1)); + MTCSyncStateChanged(mtc_slave->locked() ); + } else { + if (g_atomic_int_get (&_mtc_active) ){ + g_atomic_int_set (&_mtc_active, 0); + MTCSyncStateChanged( false ); + } + mtc_status_connection.disconnect (); + } + + LTC_Slave* ltc_slave = dynamic_cast (_slave); + if (ltc_slave) { + ltc_slave->ActiveChanged.connect_same_thread (ltc_status_connection, boost::bind (&Session::ltc_status_changed, this, _1)); + LTCSyncStateChanged (ltc_slave->locked() ); + } else { + if (g_atomic_int_get (&_ltc_active) ){ + g_atomic_int_set (&_ltc_active, 0); + LTCSyncStateChanged( false ); + } + ltc_status_connection.disconnect (); + } + DEBUG_TRACE (DEBUG::Slave, string_compose ("set new slave to %1\n", _slave)); - + // need to queue this for next process() cycle _send_timecode_update = true; @@ -1619,6 +1923,13 @@ Session::request_bounded_roll (framepos_t start, framepos_t end) lar.push_back (ar); request_play_range (&lar, true); } + +void +Session::set_requested_return_frame (framepos_t return_to) +{ + _requested_return_frame = return_to; +} + void Session::request_roll_at_and_return (framepos_t start, framepos_t return_to) { @@ -1640,8 +1951,6 @@ Session::engine_halted () */ if (_butler) { - g_atomic_int_set (&_butler->should_do_transport_work, 0); - set_post_transport_work (PostTransportWork (0)); _butler->stop (); } @@ -1657,6 +1966,8 @@ Session::engine_halted () void Session::xrun_recovery () { + ++_xrun_count; + Xrun (_transport_frame); /* EMIT SIGNAL */ if (Config->get_stop_recording_on_xrun() && actively_recording()) { @@ -1677,6 +1988,12 @@ Session::route_processors_changed (RouteProcessorChange c) } if (c.type == RouteProcessorChange::MeterPointChange) { + set_dirty (); + return; + } + + if (c.type == RouteProcessorChange::RealTimeChange) { + set_dirty (); return; } @@ -1709,10 +2026,14 @@ Session::maybe_stop (framepos_t limit) void Session::send_mmc_locate (framepos_t t) { + if (t < 0) { + return; + } + if (!_engine.freewheeling()) { Timecode::Time time; timecode_time_subframes (t, time); - _mmc->send (MIDI::MachineControlCommand (time)); + send_immediate_mmc (MIDI::MachineControlCommand (time)); } }