diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-30 01:23:19 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-30 01:23:19 +1000 |
| commit | 1316fe66010c520e2dbd724c1f95f2f5ad63345a (patch) | |
| tree | 0ba2db61ca3af08ab728636c69c22e4e6204e70d /libs/ardour/tempo.cc | |
| parent | ecd93207ade0ad7677de77e38d6b2a3fa815289c (diff) | |
Make TempoMap::framewalk_to_beats () more correct.
Diffstat (limited to 'libs/ardour/tempo.cc')
| -rw-r--r-- | libs/ardour/tempo.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 1f0d9395d5..6d83ebdc50 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -3571,7 +3571,9 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const Evoral::Beats TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const { - return Evoral::Beats (beat_at_frame (pos + distance) - beat_at_frame (pos)); + Glib::Threads::RWLock::ReaderLock lm (lock); + + return Evoral::Beats (beat_at_frame_locked (_metrics, pos + distance) - beat_at_frame_locked (_metrics, pos)); } struct bbtcmp { |