diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2018-09-25 17:46:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-09-27 11:31:13 -0400 |
| commit | c4fcd0c268bffef82a9426e4763717772656f19f (patch) | |
| tree | c0967e7ac0883cb30e48fb3912fe27a487355b92 /libs/ardour/transport_master_manager.cc | |
| parent | 147d456dbda658f15bd302fe89ec5b4f8780b148 (diff) | |
consolidate all transport masters on a SafeTime object that is a member of the TransportMaster base class.
This seems to have broken some aspects of chasing/locking
Diffstat (limited to 'libs/ardour/transport_master_manager.cc')
| -rw-r--r-- | libs/ardour/transport_master_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/transport_master_manager.cc b/libs/ardour/transport_master_manager.cc index 80d62b3adc..dee67bc6ed 100644 --- a/libs/ardour/transport_master_manager.cc +++ b/libs/ardour/transport_master_manager.cc @@ -175,8 +175,9 @@ TransportMasterManager::pre_process_transport_masters (pframes_t nframes, sample } double engine_speed; + samplepos_t ignore1, ignore2; - if (!_current_master->speed_and_position (_master_speed, _master_position, now)) { + if (!_current_master->speed_and_position (_master_speed, _master_position, ignore1, ignore2, now)) { return 1.0; } |