ardour/livetrax
13
0
Fork 0
Code

Tempo ramps - fix bug revealed by test. also small rename.

Browse Source
This commit is contained in:
nick_m 2016-04-02 05:01:06 +11:00
parent 8063b1ce3c
commit 8efbbd2bdd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/tempo.cc
View File

@ -240,10 +240,9 @@ double
TempoSection::pulse_at_tempo (const double& ppm, const framepos_t& f, const framecnt_t& frame_rate) const
{
if (_type == Constant) {
double const beats = ((f - frame()) / frames_per_pulse (frame_rate)) + pulse();
return beats;
double const pulses = ((f - frame()) / frames_per_pulse (frame_rate)) + pulse();
return pulses;
}
return pulse_at_pulse_tempo (ppm) + pulse();
}
@ -763,6 +762,10 @@ TempoMap::do_insert (MetricSection* section)
*(dynamic_cast<Tempo*>(*i)) = *(dynamic_cast<Tempo*>(insert_tempo));
(*i)->set_position_lock_style (AudioTime);
TempoSection* t;
if ((t = dynamic_cast<TempoSection*>(*i)) != 0) {
t->set_type (insert_tempo->type());
}
need_add = false;
} else {
_metrics.erase (i);