summaryrefslogtreecommitdiff
path: root/libs/ardour/engine_slave.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2018-09-25 17:46:59 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2018-09-27 11:31:13 -0400
commitc4fcd0c268bffef82a9426e4763717772656f19f (patch)
treec0967e7ac0883cb30e48fb3912fe27a487355b92 /libs/ardour/engine_slave.cc
parent147d456dbda658f15bd302fe89ec5b4f8780b148 (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/engine_slave.cc')
-rw-r--r--libs/ardour/engine_slave.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/engine_slave.cc b/libs/ardour/engine_slave.cc
index 12b7d313a2..a308557bca 100644
--- a/libs/ardour/engine_slave.cc
+++ b/libs/ardour/engine_slave.cc
@@ -76,7 +76,7 @@ Engine_TransportMaster::pre_process (pframes_t, samplepos_t, boost::optional<sam
}
bool
-Engine_TransportMaster::speed_and_position (double& sp, samplepos_t& position, samplepos_t /* now */)
+Engine_TransportMaster::speed_and_position (double& sp, samplepos_t& position, samplepos_t& lp, samplepos_t & when, samplepos_t now)
{
boost::shared_ptr<AudioBackend> backend = engine.current_backend();
@@ -88,6 +88,9 @@ Engine_TransportMaster::speed_and_position (double& sp, samplepos_t& position, s
return true;
}
+ lp = now;
+ when = now;
+
_current_delta = 0;
return false;