Tempo lines display subdivisions correctly over a tempo change

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

diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index 4f44ac54553d5f2cf25c5e6d88dc873f7a273b4b..da68f6516e127e0af653a1068653bd3600e31ae9 100644 (file)
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -27,6 +27,7 @@
 #include <glibmm/threads.h>
 
 #include "pbd/undo.h"
+#include "pbd/enum_convert.h"
 
 #include "pbd/stateful.h"
 #include "pbd/statefuldestructible.h"
@@ -46,6 +47,10 @@ namespace ARDOUR {
 class Meter;
 class TempoMap;
 
+// Find a better place for these
+LIBARDOUR_API bool bbt_time_to_string (const Timecode::BBT_Time& bbt, std::string& str);
+LIBARDOUR_API bool string_to_bbt_time (const std::string& str, Timecode::BBT_Time& bbt);
+
 /** Tempo, the speed at which musical time progresses (BPM). */
 class LIBARDOUR_API Tempo {
   public:
@@ -149,6 +154,8 @@ class LIBARDOUR_API MetricSection {
        */
        virtual XMLNode& get_state() const = 0;
 
+       virtual int set_state (const XMLNode&, int version);
+
        PositionLockStyle position_lock_style () const { return _position_lock_style; }
        void set_position_lock_style (PositionLockStyle ps) { _position_lock_style = ps; }
        bool is_tempo () const { return _is_tempo; }
@@ -156,6 +163,9 @@ class LIBARDOUR_API MetricSection {
        framepos_t frame_at_minute (const double& time) const;
        double minute_at_frame (const framepos_t& frame) const;
 
+protected:
+       void add_state_to_node (XMLNode& node) const;
+
 private:
 
        double             _pulse;
@@ -184,7 +194,7 @@ class LIBARDOUR_API MeterSection : public MetricSection, public Meter {
        }
 
        const Timecode::BBT_Time& bbt() const { return _bbt; }
-        const double& beat () const { return _beat; }
+       const double& beat () const { return _beat; }
        void set_beat (double beat) { _beat = beat; }
 
 private:
@@ -201,7 +211,7 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
        };
 
        TempoSection (const double& pulse, const double& minute, Tempo tempo, PositionLockStyle pls, framecnt_t sr)
-               : MetricSection (pulse, minute, pls, true, sr), Tempo (tempo), _c (0.0), _active (true), _locked_to_meter (false)  {}
+               : MetricSection (pulse, minute, pls, true, sr), Tempo (tempo), _c (0.0), _active (true), _locked_to_meter (false), _clamped (false)  {}
 
        TempoSection (const XMLNode&, const framecnt_t sample_rate);
 
@@ -220,6 +230,9 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
        bool locked_to_meter ()  const { return _locked_to_meter; }
        void set_locked_to_meter (bool yn) { _locked_to_meter = yn; }
 
+       bool clamped ()  const { return _clamped; }
+       void set_clamped (bool yn) { _clamped = yn; }
+
        Tempo tempo_at_minute (const double& minute) const;
        double minute_at_ntpm (const double& ntpm, const double& pulse) const;
 
@@ -236,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:
 
@@ -264,11 +276,12 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
           this enables us to keep the tempo change at the same relative
           position within the bar if/when the meter changes.
        */
+
        double _c;
        bool _active;
        bool _locked_to_meter;
+       bool _clamped;
        Timecode::BBT_Time _legacy_bbt;
-       bool _legacy_end;
 };
 
 typedef std::list<MetricSection*> Metrics;
@@ -318,7 +331,6 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
 {
   public:
        TempoMap (framecnt_t frame_rate);
-       TempoMap (TempoMap const &);
        ~TempoMap();
 
        TempoMap& operator= (TempoMap const &);
@@ -331,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(); }
@@ -367,6 +379,9 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
        const MeterSection& meter_section_at_frame (framepos_t frame) const;
        const MeterSection& meter_section_at_beat (double beat) const;
 
+       TempoSection* previous_tempo_section (TempoSection*) const;
+       TempoSection* next_tempo_section (TempoSection*) const;
+
        /** add a tempo section locked to pls. ignored values will be set in recompute_tempi()
         * @param pulse pulse position of new section. ignored if pls == AudioTime
         * @param frame frame position of new section. ignored if pls == MusicTime
@@ -498,7 +513,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
 
        void gui_set_tempo_position (TempoSection*, const framepos_t& frame, const int& sub_num);
        void gui_set_meter_position (MeterSection*, const framepos_t& frame);
-       bool gui_change_tempo (TempoSection*, const Tempo& bpm, bool change_end);
+       bool gui_change_tempo (TempoSection*, const Tempo& bpm);
        void gui_stretch_tempo (TempoSection* tempo, const framepos_t frame, const framepos_t end_frame);
        void gui_stretch_tempo_end (TempoSection* tempo, const framepos_t frame, const framepos_t end_frame);
        bool gui_twist_tempi (TempoSection* first, const Tempo& bpm, const framepos_t frame, const framepos_t end_frame);
@@ -511,6 +526,11 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
        void fix_legacy_end_session();
 
 private:
+       /* prevent copy construction */
+       TempoMap (TempoMap const&);
+
+       TempoSection* previous_tempo_section_locked (const Metrics& metrics, TempoSection*) const;
+       TempoSection* next_tempo_section_locked (const Metrics& metrics, TempoSection*) const;
 
        double beat_at_minute_locked (const Metrics& metrics, const double& minute) const;
        double minute_at_beat_locked (const Metrics& metrics, const double& beat) const;
@@ -593,8 +613,8 @@ private:
        bool remove_tempo_locked (const TempoSection&);
        bool remove_meter_locked (const MeterSection&);
 
-       TempoSection* copy_metrics_and_point (const Metrics& metrics, Metrics& copy, TempoSection* section);
-       MeterSection* copy_metrics_and_point (const Metrics& metrics, Metrics& copy, MeterSection* section);
+       TempoSection* copy_metrics_and_point (const Metrics& metrics, Metrics& copy, TempoSection* section) const;
+       MeterSection* copy_metrics_and_point (const Metrics& metrics, Metrics& copy, MeterSection* section) const;
 };
 
 }; /* namespace ARDOUR */
@@ -603,4 +623,8 @@ LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::Meter&);
 LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::Tempo&);
 LIBARDOUR_API std::ostream& operator<< (std::ostream&, const ARDOUR::MetricSection&);
 
+namespace PBD {
+       DEFINE_ENUM_CONVERT (ARDOUR::TempoSection::Type)
+}
+
 #endif /* __ardour_tempo_h__ */