remove "destination_sample" from API for Session::set_transport_speed()
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:
parent
b1922fb220
commit
ad402e76af
@ -1692,7 +1692,7 @@ private:
|
|||||||
int micro_locate (samplecnt_t distance);
|
int micro_locate (samplecnt_t distance);
|
||||||
|
|
||||||
void force_locate (samplepos_t sample, LocateTransportDisposition);
|
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_stop (bool abort, bool clear_state);
|
||||||
void realtime_locate (bool);
|
void realtime_locate (bool);
|
||||||
void non_realtime_start_scrub ();
|
void non_realtime_start_scrub ();
|
||||||
|
@ -253,7 +253,7 @@ Session::process_export_fw (pframes_t nframes)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
set_transport_speed (1.0, 0, false);
|
set_transport_speed (1.0, false);
|
||||||
butler_transport_work ();
|
butler_transport_work ();
|
||||||
g_atomic_int_set (&_butler->should_do_transport_work, 0);
|
g_atomic_int_set (&_butler->should_do_transport_work, 0);
|
||||||
butler_completed_transport_work ();
|
butler_completed_transport_work ();
|
||||||
|
@ -895,7 +895,7 @@ Session::process_event (SessionEvent* ev)
|
|||||||
|
|
||||||
|
|
||||||
case SessionEvent::SetTransportSpeed:
|
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;
|
break;
|
||||||
|
|
||||||
case SessionEvent::SetTransportMaster:
|
case SessionEvent::SetTransportMaster:
|
||||||
|
@ -380,7 +380,7 @@ Session::post_locate ()
|
|||||||
* @param speed New speed
|
* @param speed New speed
|
||||||
*/
|
*/
|
||||||
void
|
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;
|
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",
|
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;
|
_count_in_once = false;
|
||||||
unset_play_loop ();
|
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);
|
TFSM_STOP (abort, false);
|
||||||
|
Loading…
Reference in New Issue
Block a user