#include "pbd/stateful.h"
#include "pbd/statefuldestructible.h"
-#include <sigc++/signal.h>
#include "ardour/ardour.h"
public:
MetricSection (const BBT_Time& start)
: _start (start), _frame (0), _movable (true) {}
- MetricSection (nframes_t start)
+ MetricSection (nframes64_t start)
: _frame (start), _movable (true) {}
virtual ~MetricSection() {}
const BBT_Time& start() const { return _start; }
- nframes_t frame() const { return _frame; }
+ nframes64_t frame() const { return _frame; }
void set_movable (bool yn) { _movable = yn; }
bool movable() const { return _movable; }
- virtual void set_frame (nframes_t f) {
+ virtual void set_frame (nframes64_t f) {
_frame = f;
}
private:
BBT_Time _start;
- nframes_t _frame;
+ nframes64_t _frame;
bool _movable;
};
public:
MeterSection (const BBT_Time& start, double bpb, double note_type)
: MetricSection (start), Meter (bpb, note_type) {}
- MeterSection (nframes_t start, double bpb, double note_type)
+ MeterSection (nframes64_t start, double bpb, double note_type)
: MetricSection (start), Meter (bpb, note_type) {}
MeterSection (const XMLNode&);
public:
TempoSection (const BBT_Time& start, double qpm, double note_type)
: MetricSection (start), Tempo (qpm, note_type) {}
- TempoSection (nframes_t start, double qpm, double note_type)
+ TempoSection (nframes64_t start, double qpm, double note_type)
: MetricSection (start), Tempo (qpm, note_type) {}
TempoSection (const XMLNode&);
typedef std::list<MetricSection*> Metrics;
+/** Helper class that we use to be able to keep track of which
+ meter *AND* tempo are in effect at a given point in time.
+*/
+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; }
+
+ 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; }
+
+ private:
+ const Meter* _meter;
+ const Tempo* _tempo;
+ nframes64_t _frame;
+ BBT_Time _start;
+};
+
class TempoMap : public PBD::StatefulDestructible
{
public:
- TempoMap (nframes_t frame_rate);
+ TempoMap (nframes64_t frame_rate);
~TempoMap();
/* measure-based stuff */
struct BBTPoint {
BBTPointType type;
- nframes_t frame;
+ nframes64_t frame;
const Meter* meter;
const Tempo* tempo;
uint32_t bar;
uint32_t beat;
- BBTPoint (const Meter& m, const Tempo& t, nframes_t f,
+ BBTPoint (const Meter& m, const Tempo& t, nframes64_t f,
BBTPointType ty, uint32_t b, uint32_t e)
: type (ty), frame (f), meter (&m), tempo (&t), bar (b), beat (e) {}
};
(obj.*method)(*metrics);
}
- BBTPointList *get_points (nframes_t start, nframes_t end) const;
+ BBTPointList *get_points (nframes64_t start, nframes64_t end) const;
- void bbt_time (nframes_t when, BBT_Time&) const;
- nframes_t frame_time (const BBT_Time&) const;
- nframes_t bbt_duration_at (nframes_t, const BBT_Time&, int dir) 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;
void bbt_time_add (nframes64_t origin, BBT_Time& start, const BBT_Time& shift);
static const Tempo& default_tempo() { return _default_tempo; }
static const Meter& default_meter() { return _default_meter; }
- const Tempo& tempo_at (nframes_t);
- const Meter& meter_at (nframes_t);
+ const Tempo& tempo_at (nframes64_t) const;
+ const Meter& meter_at (nframes64_t) const;
- const TempoSection& tempo_section_at (nframes_t);
+ const TempoSection& tempo_section_at (nframes64_t);
void add_tempo(const Tempo&, BBT_Time where);
void add_meter(const Meter&, BBT_Time where);
- void add_tempo(const Tempo&, nframes_t where);
- void add_meter(const Meter&, nframes_t where);
+ void add_tempo(const Tempo&, nframes64_t where);
+ void add_meter(const Meter&, nframes64_t where);
void move_tempo (TempoSection&, const BBT_Time& to);
void move_meter (MeterSection&, const BBT_Time& to);
void replace_tempo (TempoSection& existing, const Tempo& replacement);
void replace_meter (MeterSection& existing, const Meter& replacement);
- nframes_t round_to_bar (nframes_t frame, int dir);
- nframes_t round_to_beat (nframes_t frame, int dir);
- nframes_t round_to_beat_subdivision (nframes_t fr, int sub_num, int dir);
- nframes_t round_to_tick (nframes_t frame, int dir);
+ 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);
- void set_length (nframes_t frames);
+ void set_length (nframes64_t frames);
XMLNode& get_state (void);
- int set_state (const XMLNode&, int version = 3000);
+ int set_state (const XMLNode&, int version);
void dump (std::ostream&) const;
void clear ();
- /** Helper class that we use to be able to keep track of which
- meter *AND* tempo are in effect at a given point in time.
- */
- class Metric {
- public:
- Metric (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 (nframes_t f) { _frame = f; }
- void set_start (const BBT_Time& t) { _start = t; }
-
- const Meter& meter() const { return *_meter; }
- const Tempo& tempo() const { return *_tempo; }
- nframes_t frame() const { return _frame; }
- const BBT_Time& start() const { return _start; }
-
- private:
- const Meter* _meter;
- const Tempo* _tempo;
- nframes_t _frame;
- BBT_Time _start;
- };
+ 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;
- Metric metric_at (BBT_Time bbt) const;
- Metric metric_at (nframes_t) const;
- void bbt_time_with_metric (nframes_t, BBT_Time&, const Metric&) 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;
- void change_existing_tempo_at (nframes_t, double bpm, double note_type);
+ void change_existing_tempo_at (nframes64_t, double bpm, double note_type);
void change_initial_tempo (double bpm, double note_type);
- void insert_time (nframes_t, nframes_t);
+ void insert_time (nframes64_t, nframes64_t);
int n_tempos () const;
int n_meters () const;
- sigc::signal<void,ARDOUR::Change> StateChanged;
+ nframes_t frame_rate () const { return _frame_rate; }
+
+ boost::signals2::signal<void(ARDOUR::Change)> StateChanged;
private:
static Tempo _default_tempo;
Metrics* metrics;
nframes_t _frame_rate;
- nframes_t last_bbt_when;
+ nframes64_t last_bbt_when;
bool last_bbt_valid;
BBT_Time last_bbt;
mutable Glib::RWLock lock;
void timestamp_metrics (bool use_bbt);
- nframes_t round_to_type (nframes_t fr, int dir, BBTPointType);
+ nframes64_t round_to_type (nframes64_t fr, int dir, BBTPointType);
- nframes_t frame_time_unlocked (const BBT_Time&) const;
+ nframes64_t frame_time_unlocked (const BBT_Time&) const;
- void bbt_time_unlocked (nframes_t, BBT_Time&) const;
+ void bbt_time_unlocked (nframes64_t, BBT_Time&) const;
- nframes_t bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int dir) const;
+ nframes64_t bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int dir) const;
const MeterSection& first_meter() const;
const TempoSection& first_tempo() const;
- nframes_t count_frames_between (const BBT_Time&, const BBT_Time&) const;
- nframes_t count_frames_between_metrics (const Meter&, const Tempo&,
+ 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;
int move_metric_section (MetricSection&, const BBT_Time& to);
projects / ardour.git / blobdiff