13
0

fix incorrect audio-locked tempo position when setting bbt via tempo dialog.

This commit is contained in:
nick_m 2016-12-11 23:49:02 +11:00
parent dbbe65777f
commit d8cabc67d9

View File

@ -3072,6 +3072,10 @@ TempoMap::predict_tempo_position (TempoSection* section, const BBT_Time& bbt)
const double beat = beat_at_bbt_locked (future_map, 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))) { if (solve_map_pulse (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) {
ret.first = tempo_copy->pulse(); ret.first = tempo_copy->pulse();
ret.second = tempo_copy->frame(); ret.second = tempo_copy->frame();