ardour/livetrax
13
0
Fork 0
Code

consolidate Session::locate() and Session::do_locate()

Browse Source 
The first no longer needs to handle requests by passing them to
JACK transport
This commit is contained in:
Paul Davis 2019-11-15 15:47:29 -07:00
parent 7199b657ba
commit 5c9e7b8234
2 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1690,7 +1690,6 @@ private:
void flush_all_inserts (); void flush_all_inserts ();
int micro_locate (samplecnt_t distance); int micro_locate (samplecnt_t distance);
void do_locate (samplepos_t, bool with_roll, bool with_flush, bool for_loop_end, bool force, bool with_mmc);
void force_locate (samplepos_t sample, bool with_roll = false); void force_locate (samplepos_t sample, bool with_roll = false);
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, samplepos_t destination_sample, 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);

53
libs/ardour/session_transport.cc
View File

@ -161,6 +161,7 @@ Session::realtime_stop (bool abort, bool clear_state)
} }
} }
/** @param with_mmc true to send a MMC locate command when the locate is done */
void void
Session::locate (samplepos_t target_sample, bool with_roll, bool with_flush, bool for_loop_end, bool force, bool with_mmc) Session::locate (samplepos_t target_sample, bool with_roll, bool with_flush, bool for_loop_end, bool force, bool with_mmc)
{ {
@ -171,47 +172,6 @@ Session::locate (samplepos_t target_sample, bool with_roll, bool with_flush, boo
return; return;
} }
if (synced_to_engine()) {
double sp;
samplepos_t pos;
samplepos_t ignore1, ignore2;
transport_master()->speed_and_position (sp, pos, ignore1, ignore2, 0);
if (target_sample != pos) {
if (config.get_jack_time_master()) {
/* actually locate now, since otherwise jack_timebase_callback
will use the incorrect _transport_sample and report an old
and incorrect time to Jack transport
*/
do_locate (target_sample, with_roll, with_flush, for_loop_end, force, with_mmc);
}
/* tell JACK to change transport position, and we will
follow along later in ::follow_slave()
*/
_engine.transport_locate (target_sample);
if (sp != 1.0f && with_roll) {
_engine.transport_start ();
}
}
} else {
do_locate (target_sample, with_roll, with_flush, for_loop_end, force, with_mmc);
}
}
/** @param with_mmc true to send a MMC locate command when the locate is done */
void
Session::do_locate (samplepos_t target_sample, bool with_roll, bool with_flush, bool for_loop_end, bool force, bool with_mmc)
{
ENSURE_PROCESS_THREAD;
bool need_butler = false; bool need_butler = false;
/* Locates for seamless looping are fairly different from other /* Locates for seamless looping are fairly different from other
@ -479,7 +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 ();
} }
_engine.transport_stop ();
} else { } else {
bool const auto_return_enabled = (!config.get_external_sync() && (Config->get_auto_return_target_list() || abort)); bool const auto_return_enabled = (!config.get_external_sync() && (Config->get_auto_return_target_list() || abort));
@ -487,13 +446,16 @@ Session::set_transport_speed (double speed, samplepos_t destination_sample, bool
_requested_return_sample = destination_sample; _requested_return_sample = destination_sample;
} }
TFSM_STOP (abort, false);
} }
TFSM_STOP (abort, false);
} else if (transport_stopped() && speed == 1.0) { } else if (transport_stopped() && speed == 1.0) {
if (as_default) { if (as_default) {
_default_transport_speed = speed; _default_transport_speed = speed;
} }
/* we are stopped and we want to start rolling at speed 1 */ /* we are stopped and we want to start rolling at speed 1 */
if (Config->get_loop_is_mode() && play_loop) { if (Config->get_loop_is_mode() && play_loop) {
@ -518,12 +480,7 @@ Session::set_transport_speed (double speed, samplepos_t destination_sample, bool
set_track_monitor_input_status (false); set_track_monitor_input_status (false);
} }
if (synced_to_engine()) {
_engine.transport_start ();
_count_in_once = false;
} else {
TFSM_EVENT (TransportFSM::StartTransport); TFSM_EVENT (TransportFSM::StartTransport);
}
} else { } else {