ardour/livetrax
13
0
Fork 0
Code

remove "destination_sample" from API for Session::set_transport_speed()

Browse Source 
This was a leftover from changes made for Tracks Live, related to
the concept of an auto-return preference. We don't use this anywhere in Ardour
or Mixbus, and the concept should eventually be removed entirely.
This commit is contained in:
Paul Davis 2020-02-17 20:16:23 -07:00
parent b1922fb220
commit ad402e76af
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/session.h
View File

@ -1692,7 +1692,7 @@ private:
int micro_locate (samplecnt_t distance);
void force_locate (samplepos_t sample, LocateTransportDisposition);
void set_transport_speed (double speed, samplepos_t destination_sample, bool abort = false, bool clear_state = false, bool as_default = false);
void set_transport_speed (double speed, bool abort = false, bool clear_state = false, bool as_default = false);
void realtime_stop (bool abort, bool clear_state);
void realtime_locate (bool);
void non_realtime_start_scrub ();

2
libs/ardour/session_export.cc
View File

@ -253,7 +253,7 @@ Session::process_export_fw (pframes_t nframes)
return;
}
set_transport_speed (1.0, 0, false);
set_transport_speed (1.0, false);
butler_transport_work ();
g_atomic_int_set (&_butler->should_do_transport_work, 0);
butler_completed_transport_work ();

2
libs/ardour/session_process.cc
View File

@ -895,7 +895,7 @@ Session::process_event (SessionEvent* ev)
case SessionEvent::SetTransportSpeed:
set_transport_speed (ev->speed, ev->target_sample, ev->yes_or_no, ev->second_yes_or_no, ev->third_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::SetTransportMaster:

9
libs/ardour/session_transport.cc
View File

@ -380,7 +380,7 @@ Session::post_locate ()
* @param speed New speed
*/
void
Session::set_transport_speed (double speed, samplepos_t destination_sample, bool abort, bool clear_state, bool as_default)
Session::set_transport_speed (double speed, bool abort, bool clear_state, bool as_default)
{
ENSURE_PROCESS_THREAD;
DEBUG_TRACE (DEBUG::Transport, string_compose ("@ %5 Set transport speed to %1, abort = %2 clear_state = %3, current = %4 as_default %6\n",
@ -439,13 +439,6 @@ Session::set_transport_speed (double speed, samplepos_t destination_sample, bool
_count_in_once = false;
unset_play_loop ();
}
} else {
bool const auto_return_enabled = (!config.get_external_sync() && (Config->get_auto_return_target_list() || abort));
if (!auto_return_enabled) {
_requested_return_sample = destination_sample;
}
}
TFSM_STOP (abort, false);