diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-11 23:10:29 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-11 23:10:29 +0000 |
commit | a1e0dc13df3cdc7033c940f0f3311a2bd47d3b2e (patch) | |
tree | 72cf696511c00bb4dfc135f43f8c0ae0498140cf /libs/ardour/mtc_slave.cc | |
parent | f938687f8798d094c99cd4308ad6aa1c467e4a97 (diff) |
tweak Stateful/StatefulDiffCommand changes so that SessionObject's actually get a name; make StatefulDiffCommand use a weak_ptr, not a raw ptr; use .val() rather than .get() to avoid confusion with boost:: smart ptr method of the same name
git-svn-id: svn://localhost/ardour2/branches/3.0@6678 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/mtc_slave.cc')
-rw-r--r-- | libs/ardour/mtc_slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index 64f67ba746..7c990bd654 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -429,7 +429,7 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos) static double average_speed = 0; nframes64_t ref_now = session.engine().frame_time_at_cycle_start(); - average_speed = pic->get_ratio (last.timestamp, last.position, ref_now, slave_pos, in_control ); + average_speed = pic->get_ratio (last.timestamp, last.position, ref_now, slave_pos, in_control, session.engine().frames_per_cycle()); pic_want_locate = pic->want_locate(); |