ardour/livetrax
13
0
Fork 0
Code

fix yet another meter-locked tempo ordering thinko.

Browse Source
This commit is contained in:
nick_m 2016-12-21 05:56:07 +11:00
parent deb059ff0d
commit 109cd269b4
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/ardour/tempo.cc
View File

@ -2658,13 +2658,11 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou
if (prev_t && !section_prev && ((sml && tlm && t->pulse() > section->pulse()) || (!tlm && t->minute() > minute))) { if (prev_t && !section_prev && ((sml && tlm && t->pulse() > section->pulse()) || (!tlm && t->minute() > minute))) {
section_prev = prev_t; section_prev = prev_t;
if (t->locked_to_meter()) { section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute));
section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute)); if (!section->locked_to_meter()) {
if (!section->locked_to_meter()) { section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute));
section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute));
}
prev_t = section;
} }
prev_t = section;
} }
if (t->position_lock_style() == MusicTime) { if (t->position_lock_style() == MusicTime) {
@ -2681,13 +2679,6 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou
} }
} }
if (section_prev) {
section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute));
if (!section->locked_to_meter()) {
section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute));
}
}
#if (0) #if (0)
recompute_tempi (imaginary); recompute_tempi (imaginary);