diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-12-11 23:49:02 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-12-11 23:49:02 +1100 |
| commit | d8cabc67d9b6d32359a353184b4604bb43abdc41 (patch) | |
| tree | 21756ee75c9553996132bb0c940339189f4eaf15 | |
| parent | dbbe65777f17c2dc9b19c351be3db8cd907dcae7 (diff) | |
fix incorrect audio-locked tempo position when setting bbt via tempo dialog.
| -rw-r--r-- | libs/ardour/tempo.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 5c140e1aac..f6a4690d3a 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -3072,6 +3072,10 @@ TempoMap::predict_tempo_position (TempoSection* section, const BBT_Time& bbt) const double beat = beat_at_bbt_locked (future_map, bbt); + if (section->position_lock_style() == AudioTime) { + tempo_copy->set_position_lock_style (MusicTime); + } + if (solve_map_pulse (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) { ret.first = tempo_copy->pulse(); ret.second = tempo_copy->frame(); |