Allow group gain sharing + VCA again

[ardour.git] / libs / ardour / ardour / tempo.h

diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index fd49037307064e1f0fe482df1ce28d796c29963e..816ec67d3345df68bda829bb5c000286a485755d 100644 (file)
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -249,7 +249,6 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
        framepos_t frame_at_pulse (const double& pulse) const;
 
        Timecode::BBT_Time legacy_bbt () { return _legacy_bbt; }
-       bool legacy_end () { return _legacy_end; }
 
   private:
 
@@ -283,7 +282,6 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
        bool _locked_to_meter;
        bool _clamped;
        Timecode::BBT_Time _legacy_bbt;
-       bool _legacy_end;
 };
 
 typedef std::list<MetricSection*> Metrics;
@@ -345,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(); }
@@ -527,6 +525,8 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
        void fix_legacy_session();
        void fix_legacy_end_session();
 
+       framepos_t music_origin ();
+
 private:
        /* prevent copy construction */
        TempoMap (TempoMap const&);