X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Ftempo.h;h=9f61d1d54d405e7f4411d694a9e33dc84aa332b0;hb=cd2047cbffc5e0270acab555364bb9d958fe7927;hp=596444173f2a8375d988b618b66f1bd27df28802;hpb=fa701b8c065251d242342b86a54d91826d2290a0;p=ardour.git diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 596444173f..9f61d1d54d 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -44,7 +44,7 @@ class Tempo { double beats_per_minute () const { return _beats_per_minute;} double note_type () const { return _note_type;} - double frames_per_beat (nframes_t sr, const Meter& meter) const; + double frames_per_beat (framecnt_t sr, const Meter& meter) const; protected: double _beats_per_minute; @@ -53,15 +53,13 @@ class Tempo { class Meter { public: - static const double ticks_per_beat; - Meter (double bpb, double bt) : _beats_per_bar (bpb), _note_type (bt) {} double beats_per_bar () const { return _beats_per_bar; } double note_divisor() const { return _note_type; } - double frames_per_bar (const Tempo&, nframes_t sr) const; + double frames_per_bar (const Tempo&, framecnt_t sr) const; protected: /** The number of beats in a bar. This is a real value because @@ -78,24 +76,24 @@ class Meter { class MetricSection { public: - MetricSection (const BBT_Time& start) + MetricSection (const Timecode::BBT_Time& start) : _start (start), _frame (0), _movable (true) {} - MetricSection (nframes64_t start) + MetricSection (framepos_t start) : _frame (start), _movable (true) {} virtual ~MetricSection() {} - const BBT_Time& start() const { return _start; } - nframes64_t frame() const { return _frame; } + const Timecode::BBT_Time& start() const { return _start; } + framepos_t frame() const { return _frame; } void set_movable (bool yn) { _movable = yn; } bool movable() const { return _movable; } - virtual void set_frame (nframes64_t f) { + virtual void set_frame (framepos_t f) { _frame = f; } - virtual void set_start (const BBT_Time& w) { + virtual void set_start (const Timecode::BBT_Time& w) { _start = w; } @@ -105,17 +103,19 @@ class MetricSection { */ virtual XMLNode& get_state() const = 0; + int compare (MetricSection *, bool) const; + private: - BBT_Time _start; - nframes64_t _frame; - bool _movable; + Timecode::BBT_Time _start; + framepos_t _frame; + bool _movable; }; class MeterSection : public MetricSection, public Meter { public: - MeterSection (const BBT_Time& start, double bpb, double note_type) + MeterSection (const Timecode::BBT_Time& start, double bpb, double note_type) : MetricSection (start), Meter (bpb, note_type) {} - MeterSection (nframes64_t start, double bpb, double note_type) + MeterSection (framepos_t start, double bpb, double note_type) : MetricSection (start), Meter (bpb, note_type) {} MeterSection (const XMLNode&); @@ -126,9 +126,9 @@ class MeterSection : public MetricSection, public Meter { class TempoSection : public MetricSection, public Tempo { public: - TempoSection (const BBT_Time& start, double qpm, double note_type) + TempoSection (const Timecode::BBT_Time& start, double qpm, double note_type) : MetricSection (start), Tempo (qpm, note_type) {} - TempoSection (nframes64_t start, double qpm, double note_type) + TempoSection (framepos_t start, double qpm, double note_type) : MetricSection (start), Tempo (qpm, note_type) {} TempoSection (const XMLNode&); @@ -145,28 +145,28 @@ typedef std::list Metrics; class TempoMetric { public: TempoMetric (const Meter& m, const Tempo& t) : _meter (&m), _tempo (&t), _frame (0) {} - + void set_tempo (const Tempo& t) { _tempo = &t; } void set_meter (const Meter& m) { _meter = &m; } - void set_frame (nframes64_t f) { _frame = f; } - void set_start (const BBT_Time& t) { _start = t; } - + void set_frame (framepos_t f) { _frame = f; } + void set_start (const Timecode::BBT_Time& t) { _start = t; } + const Meter& meter() const { return *_meter; } const Tempo& tempo() const { return *_tempo; } - nframes64_t frame() const { return _frame; } - const BBT_Time& start() const { return _start; } - + framepos_t frame() const { return _frame; } + const Timecode::BBT_Time& start() const { return _start; } + private: - const Meter* _meter; - const Tempo* _tempo; - nframes64_t _frame; - BBT_Time _start; + const Meter* _meter; + const Tempo* _tempo; + framepos_t _frame; + Timecode::BBT_Time _start; }; class TempoMap : public PBD::StatefulDestructible { public: - TempoMap (nframes64_t frame_rate); + TempoMap (framecnt_t frame_rate); ~TempoMap(); /* measure-based stuff */ @@ -178,13 +178,13 @@ class TempoMap : public PBD::StatefulDestructible struct BBTPoint { BBTPointType type; - nframes64_t frame; + framepos_t frame; const Meter* meter; const Tempo* tempo; uint32_t bar; uint32_t beat; - BBTPoint (const Meter& m, const Tempo& t, nframes64_t f, + BBTPoint (const Meter& m, const Tempo& t, framepos_t f, BBTPointType ty, uint32_t b, uint32_t e) : type (ty), frame (f), meter (&m), tempo (&t), bar (b), beat (e) {} }; @@ -196,30 +196,28 @@ class TempoMap : public PBD::StatefulDestructible (obj.*method)(*metrics); } - BBTPointList *get_points (nframes64_t start, nframes64_t end) const; - - void bbt_time (nframes64_t when, BBT_Time&) const; - nframes64_t frame_time (const BBT_Time&) const; - nframes64_t bbt_duration_at (nframes64_t, const BBT_Time&, int dir) const; + BBTPointList *get_points (framepos_t start, framepos_t end) const; - void bbt_time_add (nframes64_t origin, BBT_Time& start, const BBT_Time& shift); + void bbt_time (framepos_t when, Timecode::BBT_Time&) const; + framecnt_t frame_time (const Timecode::BBT_Time&) const; + framecnt_t bbt_duration_at (framepos_t, const Timecode::BBT_Time&, int dir) const; static const Tempo& default_tempo() { return _default_tempo; } static const Meter& default_meter() { return _default_meter; } - const Tempo& tempo_at (nframes64_t) const; - const Meter& meter_at (nframes64_t) const; + const Tempo& tempo_at (framepos_t) const; + const Meter& meter_at (framepos_t) const; - const TempoSection& tempo_section_at (nframes64_t); + const TempoSection& tempo_section_at (framepos_t) const; - void add_tempo(const Tempo&, BBT_Time where); - void add_meter(const Meter&, BBT_Time where); + void add_tempo(const Tempo&, Timecode::BBT_Time where); + void add_meter(const Meter&, Timecode::BBT_Time where); - void add_tempo(const Tempo&, nframes64_t where); - void add_meter(const Meter&, nframes64_t where); + void add_tempo(const Tempo&, framepos_t where); + void add_meter(const Meter&, framepos_t where); - void move_tempo (TempoSection&, const BBT_Time& to); - void move_meter (MeterSection&, const BBT_Time& to); + void move_tempo (TempoSection&, const Timecode::BBT_Time& to); + void move_meter (MeterSection&, const Timecode::BBT_Time& to); void remove_tempo(const TempoSection&); void remove_meter(const MeterSection&); @@ -227,12 +225,12 @@ class TempoMap : public PBD::StatefulDestructible void replace_tempo (TempoSection& existing, const Tempo& replacement); void replace_meter (MeterSection& existing, const Meter& replacement); - nframes64_t round_to_bar (nframes64_t frame, int dir); - nframes64_t round_to_beat (nframes64_t frame, int dir); - nframes64_t round_to_beat_subdivision (nframes64_t fr, int sub_num, int dir); - nframes64_t round_to_tick (nframes64_t frame, int dir); + framepos_t round_to_bar (framepos_t frame, int dir); + framepos_t round_to_beat (framepos_t frame, int dir); + framepos_t round_to_beat_subdivision (framepos_t fr, int sub_num, int dir); + framepos_t round_to_tick (framepos_t frame, int dir); - void set_length (nframes64_t frames); + void set_length (framepos_t frames); XMLNode& get_state (void); int set_state (const XMLNode&, int version); @@ -240,53 +238,56 @@ class TempoMap : public PBD::StatefulDestructible void dump (std::ostream&) const; void clear (); - TempoMetric metric_at (BBT_Time bbt) const; - TempoMetric metric_at (nframes64_t) const; - void bbt_time_with_metric (nframes64_t, BBT_Time&, const TempoMetric&) const; + TempoMetric metric_at (Timecode::BBT_Time bbt) const; + TempoMetric metric_at (framepos_t) const; + void bbt_time_with_metric (framepos_t, Timecode::BBT_Time&, const TempoMetric&) const; + + Timecode::BBT_Time bbt_add (const Timecode::BBT_Time&, const Timecode::BBT_Time&, const TempoMetric&) const; + Timecode::BBT_Time bbt_add (const Timecode::BBT_Time& a, const Timecode::BBT_Time& b) const; + Timecode::BBT_Time bbt_subtract (const Timecode::BBT_Time&, const Timecode::BBT_Time&) const; - BBT_Time bbt_add (const BBT_Time&, const BBT_Time&, const TempoMetric&) const; - BBT_Time bbt_add (const BBT_Time& a, const BBT_Time& b) const; - BBT_Time bbt_subtract (const BBT_Time&, const BBT_Time&) const; + framepos_t framepos_plus_bbt (framepos_t pos, Timecode::BBT_Time b) const; + double framewalk_to_beats (framepos_t pos, framecnt_t distance) const; - void change_existing_tempo_at (nframes64_t, double bpm, double note_type); + void change_existing_tempo_at (framepos_t, double bpm, double note_type); void change_initial_tempo (double bpm, double note_type); - void insert_time (nframes64_t, nframes64_t); + void insert_time (framepos_t, framecnt_t); int n_tempos () const; int n_meters () const; - nframes_t frame_rate () const { return _frame_rate; } + framecnt_t frame_rate () const { return _frame_rate; } private: static Tempo _default_tempo; static Meter _default_meter; Metrics* metrics; - nframes_t _frame_rate; - nframes64_t last_bbt_when; + framecnt_t _frame_rate; + framepos_t last_bbt_when; bool last_bbt_valid; - BBT_Time last_bbt; + Timecode::BBT_Time last_bbt; mutable Glib::RWLock lock; void timestamp_metrics (bool use_bbt); - nframes64_t round_to_type (nframes64_t fr, int dir, BBTPointType); + framepos_t round_to_type (framepos_t fr, int dir, BBTPointType); - nframes64_t frame_time_unlocked (const BBT_Time&) const; + framepos_t frame_time_unlocked (const Timecode::BBT_Time&) const; - void bbt_time_unlocked (nframes64_t, BBT_Time&) const; + void bbt_time_unlocked (framepos_t, Timecode::BBT_Time&) const; - nframes64_t bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int dir) const; + framecnt_t bbt_duration_at_unlocked (const Timecode::BBT_Time& when, const Timecode::BBT_Time& bbt, int dir) const; const MeterSection& first_meter() const; const TempoSection& first_tempo() const; - nframes64_t count_frames_between (const BBT_Time&, const BBT_Time&) const; - nframes64_t count_frames_between_metrics (const Meter&, const Tempo&, - const BBT_Time&, const BBT_Time&) const; + framecnt_t count_frames_between (const Timecode::BBT_Time&, const Timecode::BBT_Time&) const; + framecnt_t count_frames_between_metrics (const Meter&, const Tempo&, + const Timecode::BBT_Time&, const Timecode::BBT_Time&) const; - int move_metric_section (MetricSection&, const BBT_Time& to); + int move_metric_section (MetricSection&, const Timecode::BBT_Time& to); void do_insert (MetricSection* section, bool with_bbt); };