diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-12-12 02:37:26 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-12-12 02:37:26 +1100 |
| commit | e4d6e4a87f5f93c9cc34d1d1f8909be4c90ce0ea (patch) | |
| tree | f098934e0e4132d80db15c4f13ac2e4543c40758 /libs/ardour | |
| parent | 9c5e1ffb0d5f6eadd0620c9d5cdd14c7e1d45154 (diff) | |
disallow placement of audio-locked tempi within a frame of any other.
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/tempo.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index f901607338..30b10ad8bf 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -2567,6 +2567,11 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou } continue; } + + if (t->frame() == frame_at_minute (minute)) { + return false; + } + if (t->position_lock_style() == MusicTime) { prev_t->set_c_func (prev_t->compute_c_func_pulse (t->note_types_per_minute(), t->pulse())); t->set_minute (prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse())); |