ardour/livetrax
13
0
Fork 0
Code

Make TempoMap::framepos_plus_beats() & TempoMap::framepos_minus_beats() more correct.

Browse Source
This commit is contained in:
nick_m 2016-05-30 11:03:45 +10:00
parent 39e818a03a
commit 829c257f45
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/tempo.cc
View File

@ -3530,14 +3530,18 @@ TempoMap::remove_time (framepos_t where, framecnt_t amount)
framepos_t framepos_t
TempoMap::framepos_plus_beats (framepos_t pos, Evoral::Beats beats) const TempoMap::framepos_plus_beats (framepos_t pos, Evoral::Beats beats) const
{ {
return frame_at_beat (beat_at_frame (pos) + beats.to_double()); Glib::Threads::RWLock::ReaderLock lm (lock);
return frame_at_beat_locked (_metrics, beat_at_frame_locked (_metrics, pos) + beats.to_double());
} }
/** Subtract some (fractional) beats from a frame position, and return the result in frames */ /** Subtract some (fractional) beats from a frame position, and return the result in frames */
framepos_t framepos_t
TempoMap::framepos_minus_beats (framepos_t pos, Evoral::Beats beats) const TempoMap::framepos_minus_beats (framepos_t pos, Evoral::Beats beats) const
{ {
return frame_at_beat (beat_at_frame (pos) - beats.to_double()); Glib::Threads::RWLock::ReaderLock lm (lock);
return frame_at_beat_locked (_metrics, beat_at_frame_locked (_metrics, pos) - beats.to_double());
} }
/** Add the BBT interval op to pos and return the result */ /** Add the BBT interval op to pos and return the result */