Tempo (double bpm, double type=4.0) // defaulting to quarter note
: _beats_per_minute (bpm), _note_type(type) {}
+ /* ..or more aptly 'pulse divisions per minute'.
+ Nothing to do with actual beats, which are defined by the meter and tempo.
+ */
double beats_per_minute () const { return _beats_per_minute; }
void set_beats_per_minute (double bpm) { _beats_per_minute = bpm; }
double note_type () const { return _note_type; }
/** A section of timeline with a certain Tempo or Meter. */
class LIBARDOUR_API MetricSection {
public:
- MetricSection (double pulse)
- : _pulse (pulse), _frame (0), _movable (true), _position_lock_style (PositionLockStyle::MusicTime) {}
- MetricSection (framepos_t frame)
- : _pulse (0.0), _frame (frame), _movable (true), _position_lock_style (PositionLockStyle::AudioTime) {}
+ MetricSection (double pulse, framepos_t frame, PositionLockStyle pls)
+ : _pulse (pulse), _frame (frame), _movable (true), _position_lock_style (pls) {}
virtual ~MetricSection() {}
/** A section of timeline with a certain Meter. */
class LIBARDOUR_API MeterSection : public MetricSection, public Meter {
public:
- MeterSection (double pulse, double beat, const Timecode::BBT_Time& bbt, double bpb, double note_type)
- : MetricSection (pulse), Meter (bpb, note_type), _bbt (bbt), _beat (beat) {}
- MeterSection (framepos_t frame, double beat, double bpb, double note_type)
- : MetricSection (frame), Meter (bpb, note_type), _bbt (1, 1, 0), _beat (beat) {}
+ MeterSection (double pulse, framepos_t frame, double beat, const Timecode::BBT_Time& bbt, double bpb, double note_type, PositionLockStyle pls)
+ : MetricSection (pulse, frame, pls), Meter (bpb, note_type), _bbt (bbt), _beat (beat) {}
+
MeterSection (const XMLNode&);
static const std::string xml_state_node_name;
Constant,
};
- 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), _c_func (0.0), _active (true) {}
- 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), _c_func (0.0), _active (true) {}
+ TempoSection (const double& pulse, const framepos_t& frame, double qpm, double note_type, Type tempo_type, PositionLockStyle pls)
+ : MetricSection (pulse, frame, pls), Tempo (qpm, note_type), _type (tempo_type), _c_func (0.0), _active (true), _locked_to_meter (false) {}
+
TempoSection (const XMLNode&);
static const std::string xml_state_node_name;
XMLNode& get_state() const;
- void update_bar_offset_from_bbt (const Meter&);
- void update_bbt_time_from_bar_offset (const Meter&);
- double bar_offset() const { return _bar_offset; }
+ double c_func () const { return _c_func; }
+ void set_c_func (double c_func) { _c_func = c_func; }
+
+ void set_type (Type type);
+ Type type () const { return _type; }
bool active () const { return _active; }
void set_active (bool yn) { _active = yn; }
- void set_type (Type type);
- Type type () const { return _type; }
+ bool locked_to_meter () const { return _locked_to_meter; }
+ void set_locked_to_meter (bool yn) { _locked_to_meter = yn; }
double tempo_at_frame (const framepos_t& frame, const framecnt_t& frame_rate) const;
framepos_t frame_at_tempo (const double& ppm, const double& beat, const framecnt_t& frame_rate) const;
double pulse_at_tempo (const double& ppm, const framepos_t& frame, const framecnt_t& frame_rate) const;
double pulse_at_frame (const framepos_t& frame, const framecnt_t& frame_rate) const;
- framepos_t frame_at_pulse (const double& pulse, const framecnt_t& frame_rate) const;
+ frameoffset_t frame_at_pulse (const double& pulse, const framecnt_t& frame_rate) const;
double compute_c_func_pulse (const double& end_bpm, const double& end_pulse, const framecnt_t& frame_rate);
double compute_c_func_frame (const double& end_bpm, const framepos_t& end_frame, const framecnt_t& frame_rate) const;
- double get_c_func () const { return _c_func; }
- void set_c_func (double c_func) { _c_func = c_func; }
-
Timecode::BBT_Time legacy_bbt () { return _legacy_bbt; }
private:
- framecnt_t minute_to_frame (const double& time, const framecnt_t& frame_rate) const;
- double frame_to_minute (const framecnt_t& frame, const framecnt_t& frame_rate) const;
+ framepos_t minute_to_frame (const double& time, const framecnt_t& frame_rate) const;
+ double frame_to_minute (const framepos_t& frame, const framecnt_t& frame_rate) const;
/* tempo ramp functions. zero-based with time in minutes,
* 'tick tempo' in ticks per minute and tempo in bpm.
this enables us to keep the tempo change at the same relative
position within the bar if/when the meter changes.
*/
- double _bar_offset;
Type _type;
double _c_func;
bool _active;
+ bool _locked_to_meter;
Timecode::BBT_Time _legacy_bbt;
};
struct BBTPoint {
framepos_t frame;
- const MeterSection* meter;
- const Tempo tempo;
+ Meter meter;
+ Tempo tempo;
double c;
uint32_t bar;
uint32_t beat;
BBTPoint (const MeterSection& m, const Tempo& t, framepos_t f,
uint32_t b, uint32_t e, double func_c)
- : frame (f), meter (&m), tempo (t.beats_per_minute(), t.note_type()), c (func_c), bar (b), beat (e) {}
+ : frame (f), meter (m.divisions_per_bar(), m.note_divisor()), tempo (t.beats_per_minute(), t.note_type()), c (func_c), bar (b), beat (e) {}
Timecode::BBT_Time bbt() const { return Timecode::BBT_Time (bar, beat, 0); }
operator Timecode::BBT_Time() const { return bbt(); }
const TempoSection& tempo_section_at (framepos_t frame) const;
const MeterSection& meter_section_at (framepos_t frame) const;
+ const MeterSection& meter_section_at_beat (double beat) const;
- void add_tempo (const Tempo&, const double& pulse, TempoSection::Type type);
- void add_tempo (const Tempo&, const framepos_t& frame, TempoSection::Type type);
- void add_meter (const Meter&, const double& beat, const Timecode::BBT_Time& where);
- void add_meter (const Meter&, const framepos_t& frame);
+ /** add a tempo section locked to pls. ignored values will be set in recompute_tempos()
+ * @param pulse pulse position of new section. ignored if pls == AudioTime
+ * @param frame frame position of new section. ignored if pls == MusicTime
+ * @param type type of new tempo section (Ramp, Constant)
+ */
+ TempoSection* add_tempo (const Tempo&, const double& pulse, const framepos_t& frame, TempoSection::Type type, PositionLockStyle pls);
+
+ /** add an meter section locked to pls.. ignored values will be set in recompute_meters()
+ * @param beat beat position of new section
+ * @param where bbt position of new section
+ * @param frame frame position of new section. ignored if pls == MusicTime
+ */
+ MeterSection* add_meter (const Meter&, const double& beat, const Timecode::BBT_Time& where, const framepos_t& frame, PositionLockStyle pls);
void remove_tempo (const TempoSection&, bool send_signal);
void remove_meter (const MeterSection&, bool send_signal);
- framepos_t predict_tempo_frame (TempoSection* section, const Tempo& bpm, const Timecode::BBT_Time& bbt);
- double predict_tempo_pulse (TempoSection* section, const Tempo& bpm, const framepos_t& frame);
+ void replace_tempo (const TempoSection&, const Tempo&, const double& pulse, const framepos_t& frame
+ , TempoSection::Type type, PositionLockStyle pls);
- void replace_tempo (const TempoSection&, const Tempo&, const double& where, TempoSection::Type type);
- void replace_tempo (const TempoSection&, const Tempo&, const framepos_t& frame, TempoSection::Type type);
+ void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where, const framepos_t& frame
+ , PositionLockStyle pls);
- void gui_move_tempo_frame (TempoSection*, const Tempo& bpm, const framepos_t& frame);
- void gui_move_tempo_beat (TempoSection*, const Tempo& bpm, const double& frame);
- void gui_move_meter (MeterSection*, const Meter& mt, const framepos_t& frame);
- void gui_move_meter (MeterSection*, const Meter& mt, const double& beat);
- bool gui_change_tempo (TempoSection*, const Tempo& bpm);
+ std::pair<double, framepos_t> predict_tempo_position (TempoSection* section, const Timecode::BBT_Time& bbt);
- bool can_solve_bbt (TempoSection* section, const Tempo& bpm, const Timecode::BBT_Time& bbt);
+ void gui_move_tempo (TempoSection*, const std::pair<double, framepos_t>& pulse);
+ void gui_move_meter (MeterSection*, const framepos_t& frame);
- void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where);
- void replace_meter (const MeterSection&, const Meter&, const framepos_t& frame);
+ bool gui_change_tempo (TempoSection*, const Tempo& bpm);
+ void gui_dilate_tempo (TempoSection* tempo, const framepos_t& frame, const framepos_t& end_frame, const double& pulse);
+
+ bool can_solve_bbt (TempoSection* section, const Timecode::BBT_Time& bbt);
framepos_t round_to_bar (framepos_t frame, RoundMode dir);
framepos_t round_to_beat (framepos_t frame, RoundMode dir);
framepos_t round_to_beat_subdivision (framepos_t fr, int sub_num, RoundMode dir);
+ void round_bbt (Timecode::BBT_Time& when, const int32_t& snap_divisor, RoundMode dir);
void set_length (framepos_t frames);
+ void fix_legacy_session();
+
XMLNode& get_state (void);
int set_state (const XMLNode&, int version);
double pulse_at_beat (const double& beat) const;
double beat_at_pulse (const double& pulse) const;
+ double pulse_at_frame (const framecnt_t& frame) const;
+ framecnt_t frame_at_pulse (const double& pulse) const;
+
PBD::Signal0<void> MetricPositionChanged;
private:
double pulse_at_beat_locked (const Metrics& metrics, const double& beat) const;
double beat_at_pulse_locked (const Metrics& metrics, const double& pulse) const;
- double pulse_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const;
- framecnt_t frame_at_pulse_locked (const Metrics& metrics, const double& beat) const;
- double beat_offset_at (const Metrics& metrics, const double& beat) const;
- frameoffset_t frame_offset_at (const Metrics& metrics, const framepos_t& frame) const;
+ double pulse_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const;
+ framecnt_t frame_at_pulse_locked (const Metrics& metrics, const double& pulse) const;
double beat_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const;
framecnt_t frame_at_beat_locked (const Metrics& metrics, const double& beat) const;
+
double bbt_to_beats_locked (const Metrics& metrics, const Timecode::BBT_Time& bbt) const ;
Timecode::BBT_Time beats_to_bbt_locked (const Metrics& metrics, const double& beats) const;
framepos_t frame_time_locked (const Metrics& metrics, const Timecode::BBT_Time&) const;
- const MeterSection& meter_section_at_locked (framepos_t frame) const;
- const TempoSection& tempo_section_at_locked (framepos_t frame) const;
- const Tempo tempo_at_locked (const framepos_t& frame) const;
+ const TempoSection& tempo_section_at_locked (const Metrics& metrics, framepos_t frame) const;
+ const TempoSection& tempo_section_at_beat_locked (const Metrics& metrics, const double& beat) const;
+ const TempoSection& tempo_section_at_pulse_locked (const Metrics& metrics, const double& pulse) const;
+ const Tempo tempo_at_locked (const Metrics& metrics, const framepos_t& frame) const;
+
+ const MeterSection& meter_section_at_locked (const Metrics& metrics, framepos_t frame) const;
+ const MeterSection& meter_section_at_beat_locked (const Metrics& metrics, const double& beat) const;
+
+ bool check_solved (const Metrics& metrics) const;
+ bool set_active_tempos (const Metrics& metrics, const framepos_t& frame);
- bool check_solved (Metrics& metrics, bool by_frame);
- bool solve_map (Metrics& metrics, TempoSection* section, const Tempo& bpm, const framepos_t& frame);
- bool solve_map (Metrics& metrics, TempoSection* section, const Tempo& bpm, const double& pulse);
- void solve_map (Metrics& metrics, MeterSection* section, const Meter& mt, const framepos_t& frame);
- void solve_map (Metrics& metrics, MeterSection* section, const Meter& mt, const double& pulse);
+ bool solve_map_frame (Metrics& metrics, TempoSection* section, const framepos_t& frame);
+ bool solve_map_pulse (Metrics& metrics, TempoSection* section, const double& pulse);
+ bool solve_map_frame (Metrics& metrics, MeterSection* section, const framepos_t& frame);
+ bool solve_map_bbt (Metrics& metrics, MeterSection* section, const Timecode::BBT_Time& bbt);
friend class ::BBTTest;
friend class ::FrameposPlusBeatsTest;
void do_insert (MetricSection* section);
- void add_tempo_locked (const Tempo&, double pulse, bool recompute, TempoSection::Type type);
- void add_tempo_locked (const Tempo&, framepos_t frame, bool recompute, TempoSection::Type type);
+ TempoSection* add_tempo_locked (const Tempo&, double pulse, framepos_t frame
+ , TempoSection::Type type, PositionLockStyle pls, bool recompute, bool locked_to_meter = false);
- void add_meter_locked (const Meter&, double beat, Timecode::BBT_Time where, bool recompute);
- void add_meter_locked (const Meter&, framepos_t frame, bool recompute);
+ MeterSection* add_meter_locked (const Meter&, double beat, const Timecode::BBT_Time& where, framepos_t frame
+ , PositionLockStyle pls, bool recompute);
bool remove_tempo_locked (const TempoSection&);
bool remove_meter_locked (const MeterSection&);
- TempoSection* copy_metrics_and_point (Metrics& copy, TempoSection* section);
+ TempoSection* copy_metrics_and_point (const Metrics& metrics, Metrics& copy, TempoSection* section);
+ MeterSection* copy_metrics_and_point (const Metrics& metrics, Metrics& copy, MeterSection* section);
};
}; /* namespace ARDOUR */
projects / ardour.git / blobdiff