Tempo lines display subdivisions correctly over a tempo change

TempoMap::get_grid() supplies a list of beat positions, leaving the lines
to work out any subdivision positions.
This is fine, unless a tempo section falls in between beats.
Use a BeatsFramesConverter along with a quarter note position
(in the BBTPointsList) to make this easier.

1 files changed, 4 insertions, 4 deletions

diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index 197c8c5f8f..da68f6516e 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -343,16 +343,16 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
 	};
 
 	struct BBTPoint {
-		framepos_t          frame;
 		Meter               meter;
 		Tempo               tempo;
-		double              c;
+		framepos_t          frame;
 		uint32_t            bar;
 		uint32_t            beat;
+		double              qn;
 
 		BBTPoint (const MeterSection& m, const Tempo& t, framepos_t f,
-		          uint32_t b, uint32_t e, double func_c)
-		: frame (f), meter (m.divisions_per_bar(), m.note_divisor()), tempo (t.note_types_per_minute(), t.note_type(), t.end_note_types_per_minute()), c (func_c), bar (b), beat (e) {}
+		          uint32_t b, uint32_t e, double qnote)
+		: meter (m), tempo (t), frame (f), bar (b), beat (e), qn (qnote) {}
 
 		Timecode::BBT_Time bbt() const { return Timecode::BBT_Time (bar, beat, 0); }
 		operator Timecode::BBT_Time() const { return bbt(); }