smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

Tempo ramps - amend previous commit.

Browse source
This commit is contained in:
nick_m 2015-12-24 05:59:36 +11:00
parent 8d007e8a77
commit 41c8b534b7
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/ardour/tempo.cc
View file

@ -673,8 +673,6 @@ TempoMap::gui_set_tempo_frame (TempoSection& ts, framepos_t frame)
{
TempoSection& first (first_tempo());
if (ts.frame() != first.frame()) {
const MeterSection* meter = &meter_section_at (frame);
BBT_Time bbt;
{
Glib::Threads::RWLock::WriterLock lm (lock);
@ -686,8 +684,11 @@ TempoMap::gui_set_tempo_frame (TempoSection& ts, framepos_t frame)
Metrics::const_iterator i;
TempoSection* prev_ts = 0;
MeterSection* meter = 0;
for (i = metrics.begin(); i != metrics.end(); ++i) {
TempoSection* t;
MeterSection* m;
if ((t = dynamic_cast<TempoSection*> (*i)) != 0) {
@ -697,9 +698,18 @@ TempoMap::gui_set_tempo_frame (TempoSection& ts, framepos_t frame)
prev_ts = t;
}
if ((m = dynamic_cast<MeterSection*> (*i)) != 0) {
if ((*i)->frame() > frame) {
break;
}
meter = m;
}
}
if (prev_ts) {
if (prev_ts && meter) {
/* set the start bbt */
double const ticks_to_ts = prev_ts->tick_at_frame (frame - prev_ts->frame(), ts.beats_per_minute(), frame - prev_ts->frame(), _frame_rate);