From: nick_m <mainsbridge@gmail.com>
Date: Mon, 23 May 2016 20:19:36 +0000 (+1000)
Subject: Tempo ramps - first tempo is a ramp, fix extra meter recompute.
X-Git-Tag: 5.0-pre0~344
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=cfe1c85f4f467f6b2fb9a7dbc4f30b25f7bb5614;p=ardour.git

Tempo ramps - first tempo is a ramp, fix extra meter recompute.
---

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 ());
 }