Tempo ramps - use consistent naming for _locked methods, use enum_2_string for TempoS...

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

diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index f27622c91f6c582bd92326d231a99f81b9394838..bc52c489024bab747964fb5538a418e6bcdbbdb3 100644 (file)
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -99,15 +99,14 @@ class LIBARDOUR_API Meter {
 /** A section of timeline with a certain Tempo or Meter. */
 class LIBARDOUR_API MetricSection {
   public:
-       MetricSection (double start)
-               : _beat (start), _frame (0), _movable (true), _position_lock_style (MusicTime) {}
+       MetricSection (double beat)
+               : _beat (beat), _frame (0), _movable (true), _position_lock_style (MusicTime) {}
        MetricSection (framepos_t frame)
                : _beat (0), _frame (frame), _movable (true), _position_lock_style (MusicTime) {}
 
        virtual ~MetricSection() {}
-       const double start () const { return _beat; }
 
-       const double& beat() const { return _beat; }
+       const double& beat () const { return _beat; }
        void set_beat (double beat) { _beat = beat;}
 
        framepos_t frame() const { return _frame; }
@@ -123,6 +122,7 @@ class LIBARDOUR_API MetricSection {
           XML state information.
        */
        virtual XMLNode& get_state() const = 0;
+
        PositionLockStyle position_lock_style () const { return _position_lock_style; }
        void set_position_lock_style (PositionLockStyle ps) { _position_lock_style = ps; }
 
@@ -136,8 +136,8 @@ private:
 /** A section of timeline with a certain Meter. */
 class LIBARDOUR_API MeterSection : public MetricSection, public Meter {
   public:
-       MeterSection (double start, const Timecode::BBT_Time& bbt, double bpb, double note_type)
-               : MetricSection (start), Meter (bpb, note_type), _bbt (bbt) {}
+       MeterSection (double beat, const Timecode::BBT_Time& bbt, double bpb, double note_type)
+               : MetricSection (beat), Meter (bpb, note_type), _bbt (bbt) {}
        MeterSection (framepos_t frame, double bpb, double note_type)
                : MetricSection (frame), Meter (bpb, note_type) {}
        MeterSection (const XMLNode&);
@@ -146,10 +146,11 @@ class LIBARDOUR_API MeterSection : public MetricSection, public Meter {
 
        XMLNode& get_state() const;
 
-       void set_start (std::pair<double, Timecode::BBT_Time>& w) {
-               set_beat (w.first);
+       void set_beat (std::pair<double, Timecode::BBT_Time>& w) {
+               MetricSection::set_beat (w.first);
                _bbt = w.second;
        }
+
        const Timecode::BBT_Time& bbt() const { return _bbt; }
 private:
        Timecode::BBT_Time _bbt;
@@ -163,8 +164,8 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
                Constant,
        };
 
-       TempoSection (const double& start, double qpm, double note_type, Type tempo_type)
-               : MetricSection (start), Tempo (qpm, note_type), _bar_offset (-1.0), _type (tempo_type)  {}
+       TempoSection (const double& beat, double qpm, double note_type, Type tempo_type)
+               : MetricSection (beat), Tempo (qpm, note_type), _bar_offset (-1.0), _type (tempo_type)  {}
        TempoSection (framepos_t frame, double qpm, double note_type, Type tempo_type)
                : MetricSection (frame), Tempo (qpm, note_type), _bar_offset (-1.0), _type (tempo_type) {}
        TempoSection (const XMLNode&);
@@ -173,10 +174,6 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
 
        XMLNode& get_state() const;
 
-       void set_start (const double& w) {
-               set_beat (w);
-       }
-
        void update_bar_offset_from_bbt (const Meter&);
        void update_bbt_time_from_bar_offset (const Meter&);
        double bar_offset() const { return _bar_offset; }
@@ -205,10 +202,8 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
         *  time relative to section start.
         */
        double c_func (double end_tpm, double end_time) const;
-       double a_func (double begin_tpm, double end_tpm, double end_time) const;
+       double a_func (double end_tpm, double c_func) const;
 
-       double tempo_at_time (double time, double end_bpm, double end_time) const;
-       double time_at_tempo (double tempo, double end_bpm, double end_time) const;
        double tick_tempo_at_time (double time, double end_tpm, double end_time) const;
        double time_at_tick_tempo (double tick_tempo, double end_tpm, double end_time) const;
 
@@ -244,7 +239,7 @@ class LIBARDOUR_API TempoMetric {
        void set_tempo (const Tempo& t)              { _tempo = &t; }
        void set_meter (const Meter& m)              { _meter = &m; }
        void set_frame (framepos_t f)                { _frame = f; }
-       void set_start (const double& t)             { _start = t; }
+       void set_beat (const double& t)              { _beat = t; }
 
        void set_metric (const MetricSection* section) {
                const MeterSection* meter;
@@ -256,19 +251,19 @@ class LIBARDOUR_API TempoMetric {
                }
 
                set_frame(section->frame());
-               set_start(section->start());
+               set_beat(section->beat());
        }
 
        const Meter&              meter() const { return *_meter; }
        const Tempo&              tempo() const { return *_tempo; }
        framepos_t                frame() const { return _frame; }
-       const double& start() const { return _start; }
+       const double&             beat() const { return _beat; }
 
   private:
        const Meter*       _meter;
        const Tempo*       _tempo;
        framepos_t         _frame;
-       double             _start;
+       double             _beat;
 };
 
 /** Tempo Map - mapping of timecode to musical time.
@@ -361,14 +356,14 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
        const MeterSection& meter_section_at (framepos_t) const;
 
        void add_tempo (const Tempo&, double where, TempoSection::Type type);
-       void add_meter (const Meter&, double start, Timecode::BBT_Time where);
+       void add_meter (const Meter&, double beat, Timecode::BBT_Time where);
 
        void remove_tempo (const TempoSection&, bool send_signal);
        void remove_meter (const MeterSection&, bool send_signal);
 
        void replace_tempo (const TempoSection&, const Tempo&, const double& where, TempoSection::Type type);
        void gui_set_tempo_frame (TempoSection&, framepos_t where, double beat);
-       void replace_meter (const MeterSection&, const Meter&, const double& start, const Timecode::BBT_Time& where);
+       void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where);
 
        framepos_t round_to_bar  (framepos_t frame, RoundMode dir);
        framepos_t round_to_beat (framepos_t frame, RoundMode dir);
@@ -405,8 +400,11 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
        PBD::Signal0<void> MetricPositionChanged;
 
        double bbt_to_beats (Timecode::BBT_Time bbt);
+       Timecode::BBT_Time beats_to_bbt (double beats);
 
 private:
+       double bbt_to_beats_locked (Timecode::BBT_Time bbt);
+       Timecode::BBT_Time beats_to_bbt_locked (double beats);
 
        friend class ::BBTTest;
        friend class ::FrameposPlusBeatsTest;
@@ -421,10 +419,6 @@ private:
 
        void recompute_map (bool reassign_tempo_bbt, framepos_t end = -1);
 
-       void _extend_map (TempoSection* tempo, MeterSection* meter,
-                         Metrics::iterator next_metric,
-                         Timecode::BBT_Time current, framepos_t current_frame, framepos_t end);
-
        framepos_t round_to_type (framepos_t fr, RoundMode dir, BBTPointType);
 
        const MeterSection& first_meter() const;
@@ -432,13 +426,10 @@ private:
        const TempoSection& first_tempo() const;
        TempoSection&       first_tempo();
 
-       Timecode::BBT_Time beats_to_bbt (double beats);
-       int32_t bars_in_meter_section (MeterSection* ms) const;
-
        void do_insert (MetricSection* section);
 
        void add_tempo_locked (const Tempo&, double where, bool recompute, TempoSection::Type type);
-       void add_meter_locked (const Meter&, double start, Timecode::BBT_Time where, bool recompute);
+       void add_meter_locked (const Meter&, double beat, Timecode::BBT_Time where, bool recompute);
 
        bool remove_tempo_locked (const TempoSection&);
        bool remove_meter_locked (const MeterSection&);