diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2020-03-13 13:49:44 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2020-03-13 13:52:38 -0600 |
| commit | f5ec5ea9296df29e99369c85c204ac4cfe4a6e25 (patch) | |
| tree | e5238ce040bed094de0869b1f3d3cf0354dae3ef /libs/ardour/session_process.cc | |
| parent | cc43ec3ef6ad782eab6dd71c285e2c4da70e990b (diff) | |
add new API to TransportMasterManager to manage use of DiskReader::{inc,dec}_no_disk_output()
Diffstat (limited to 'libs/ardour/session_process.cc')
| -rw-r--r-- | libs/ardour/session_process.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 720f1a7129..ffe2560478 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -1170,8 +1170,6 @@ Session::follow_transport_master (pframes_t nframes) if (!actively_recording() && abs (delta) > (5 * current_block_size)) { - DiskReader::inc_no_disk_output (); - if (!locate_pending() && !declick_in_progress()) { DEBUG_TRACE (DEBUG::Slave, string_compose ("request locate to master position %1\n", master_transport_sample)); /* note that for non-JACK transport masters, we assume that the transport state (rolling,stopped) after the locate @@ -1205,12 +1203,12 @@ Session::follow_transport_master (pframes_t nframes) if ((tmm.current()->type() != Engine) && !actively_recording() && abs (delta) > tmm.current()->resolution()) { /* just varispeed to chase the master, and be silent till we're synced */ - DiskReader::inc_no_disk_output (); + tmm.block_disk_output (); return true; } /* speed is set, we're locked, and good to go */ - DiskReader::dec_no_disk_output (); + tmm.unblock_disk_output (); return true; noroll: @@ -1219,9 +1217,3 @@ Session::follow_transport_master (pframes_t nframes) no_roll (nframes); return false; } - -void -Session::reset_slave_state () -{ - DiskReader::dec_no_disk_output (); -} |