allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

correct (?) behaviour of TempoMap::replace_tempo

Browse Source
This commit is contained in:
nick_m
2017-02-25 06:59:05 +11:00
committed by Robin Gareus
parent ccb51a8ddb
commit 8b1baa2406
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/tempo.cc
View File

@@ -1155,12 +1155,10 @@ TempoMap::replace_tempo (TempoSection& ts, const Tempo& tempo, const double& pul
bool const lm = new_ts->locked_to_meter();
if ((ipm && this_t->pulse() > new_ts->pulse()) || (!ipm && this_t->frame() > new_ts->frame())
|| (lm && this_t->pulse() > new_ts->pulse())) {
//if (prev_tempo && prev_tempo->type() == TempoSection::Ramp) {
new_ts->set_end_note_types_per_minute (this_t->note_types_per_minute());
//}
new_ts->set_end_note_types_per_minute (tempo.end_note_types_per_minute());
break;
}
//prev_tempo = this_t;
}
}
}