summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-05-24 06:19:36 +1000
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:17 +1000
commitcfe1c85f4f467f6b2fb9a7dbc4f30b25f7bb5614 (patch)
treefba1fcb11a192980ba6ec488480eee4907e64cb7 /libs
parent2c331341cce7caf60e6b1461791fddc4841bac9d (diff)
Tempo ramps - first tempo is a ramp, fix extra meter recompute.
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/tempo.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 8599594b3b..9fa77a71a9 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -649,7 +649,7 @@ TempoMap::TempoMap (framecnt_t fr)
_frame_rate = fr;
BBT_Time start (1, 1, 0);
- TempoSection *t = new TempoSection (0.0, 0, _default_tempo.beats_per_minute(), _default_tempo.note_type(), TempoSection::Constant, AudioTime);
+ TempoSection *t = new TempoSection (0.0, 0, _default_tempo.beats_per_minute(), _default_tempo.note_type(), TempoSection::Ramp, AudioTime);
MeterSection *m = new MeterSection (0.0, 0, 0.0, start, _default_meter.divisions_per_bar(), _default_meter.note_divisor(), AudioTime);
t->set_movable (false);
@@ -999,9 +999,10 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T
first_t.set_frame (first.frame());
first_t.set_pulse (0.0);
first_t.set_position_lock_style (AudioTime);
+ recompute_map (_metrics);
}
- recompute_map (_metrics);
}
+
PropertyChanged (PropertyChange ());
}