#include <glibmm/threads.h>
#include "pbd/undo.h"
+#include "pbd/enum_convert.h"
#include "pbd/stateful.h"
#include "pbd/statefuldestructible.h"
-#include "evoral/Beats.hpp"
+#include "temporal/beats.h"
#include "ardour/ardour.h"
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:
double end_pulses_per_minute () const { return end_note_types_per_minute (1.0); }
/** audio samples per note type.
- * if you want an instantaneous value for this, use TempoMap::frames_per_quarter_note_at() instead.
+ * if you want an instantaneous value for this, use TempoMap::samples_per_quarter_note_at() instead.
* @param sr samplerate
*/
- double frames_per_note_type (framecnt_t sr) const {
+ double samples_per_note_type (samplecnt_t sr) const {
return (60.0 * sr) / _note_types_per_minute;
}
/** audio samples per quarter note.
- * if you want an instantaneous value for this, use TempoMap::frames_per_quarter_note_at() instead.
+ * if you want an instantaneous value for this, use TempoMap::samples_per_quarter_note_at() instead.
* @param sr samplerate
*/
- double frames_per_quarter_note (framecnt_t sr) const {
+ double samples_per_quarter_note (samplecnt_t sr) const {
return (60.0 * sr) / quarter_notes_per_minute ();
}
double divisions_per_bar () const { return _divisions_per_bar; }
double note_divisor() const { return _note_type; }
- double frames_per_bar (const Tempo&, framecnt_t sr) const;
- double frames_per_grid (const Tempo&, framecnt_t sr) const;
+ double samples_per_bar (const Tempo&, samplecnt_t sr) const;
+ double samples_per_grid (const Tempo&, samplecnt_t sr) const;
inline bool operator==(const Meter& other)
{ return _divisions_per_bar == other.divisions_per_bar() && _note_type == other.note_divisor(); }
/** A section of timeline with a certain Tempo or Meter. */
class LIBARDOUR_API MetricSection {
public:
- MetricSection (double pulse, double minute, PositionLockStyle pls, bool is_tempo, framecnt_t sample_rate)
+ MetricSection (double pulse, double minute, PositionLockStyle pls, bool is_tempo, samplecnt_t sample_rate)
: _pulse (pulse), _minute (minute), _initial (false), _position_lock_style (pls), _is_tempo (is_tempo), _sample_rate (sample_rate) {}
virtual ~MetricSection() {}
_minute = m;
}
- framepos_t frame () const { return frame_at_minute (_minute); }
+ samplepos_t sample () const { return sample_at_minute (_minute); }
void set_initial (bool yn) { _initial = yn; }
bool initial() const { return _initial; }
*/
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; }
- framepos_t frame_at_minute (const double& time) const;
- double minute_at_frame (const framepos_t& frame) const;
+ samplepos_t sample_at_minute (const double& time) const;
+ double minute_at_sample (const samplepos_t sample) const;
+
+protected:
+ void add_state_to_node (XMLNode& node) const;
private:
bool _initial;
PositionLockStyle _position_lock_style;
const bool _is_tempo;
- framecnt_t _sample_rate;
+ samplecnt_t _sample_rate;
};
/** A section of timeline with a certain Meter. */
class LIBARDOUR_API MeterSection : public MetricSection, public Meter {
public:
- MeterSection (double pulse, double minute, double beat, const Timecode::BBT_Time& bbt, double bpb, double note_type, PositionLockStyle pls, framecnt_t sr)
+ MeterSection (double pulse, double minute, double beat, const Timecode::BBT_Time& bbt, double bpb, double note_type, PositionLockStyle pls, samplecnt_t sr)
: MetricSection (pulse, minute, pls, false, sr), Meter (bpb, note_type), _bbt (bbt), _beat (beat) {}
- MeterSection (const XMLNode&, const framecnt_t sample_rate);
+ MeterSection (const XMLNode&, const samplecnt_t sample_rate);
static const std::string xml_state_node_name;
}
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:
Constant,
};
- 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) {}
+ TempoSection (const double& pulse, const double& minute, Tempo tempo, PositionLockStyle pls, samplecnt_t sr)
+ : 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);
+ TempoSection (const XMLNode&, const samplecnt_t sample_rate);
static const std::string xml_state_node_name;
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;
double compute_c_pulse (const double& end_ntpm, const double& end_pulse) const;
double compute_c_minute (const double& end_ntpm, const double& end_minute) const;
- double pulse_at_frame (const framepos_t& frame) const;
- framepos_t frame_at_pulse (const double& pulse) const;
+ double pulse_at_sample (const samplepos_t sample) const;
+ samplepos_t sample_at_pulse (const double& pulse) const;
Timecode::BBT_Time legacy_bbt () { return _legacy_bbt; }
- bool legacy_end () { return _legacy_end; }
private:
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;
class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
{
public:
- TempoMap (framecnt_t frame_rate);
- TempoMap (TempoMap const &);
+ TempoMap (samplecnt_t sample_rate);
~TempoMap();
TempoMap& operator= (TempoMap const &);
};
struct BBTPoint {
- framepos_t frame;
Meter meter;
Tempo tempo;
- double c;
+ samplepos_t sample;
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) {}
+ BBTPoint (const MeterSection& m, const Tempo& t, samplepos_t f,
+ uint32_t b, uint32_t e, double qnote)
+ : meter (m), tempo (t), sample (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(); }
- operator framepos_t() const { return frame; }
+ operator samplepos_t() const { return sample; }
bool is_bar() const { return beat == 1; }
};
}
void get_grid (std::vector<BBTPoint>&,
- framepos_t start, framepos_t end, uint32_t bar_mod = 0);
+ samplepos_t start, samplepos_t end, uint32_t bar_mod = 0);
static const Tempo& default_tempo() { return _default_tempo; }
static const Meter& default_meter() { return _default_meter; }
/* because tempi may be ramped, this is only valid for the instant requested.*/
- double frames_per_quarter_note_at (const framepos_t&, const framecnt_t& sr) const;
+ double samples_per_quarter_note_at (const samplepos_t, const samplecnt_t sr) const;
- const TempoSection& tempo_section_at_frame (framepos_t frame) const;
- TempoSection& tempo_section_at_frame (framepos_t frame);
- const MeterSection& meter_section_at_frame (framepos_t frame) const;
+ const TempoSection& tempo_section_at_sample (samplepos_t sample) const;
+ TempoSection& tempo_section_at_sample (samplepos_t sample);
+ const MeterSection& meter_section_at_sample (samplepos_t sample) const;
const MeterSection& meter_section_at_beat (double beat) const;
TempoSection* previous_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
+ * @param sample 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, PositionLockStyle pls);
+ TempoSection* add_tempo (const Tempo&, const double& pulse, const samplepos_t sample, PositionLockStyle pls);
/** add a meter section locked to pls.. ignored values will be set in recompute_meters()
* @param meter the Meter to be added
- * @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
- * note that @frame may also be ignored if it would create an un-solvable map
- * (previous audio-locked tempi may place the requested beat at an earlier time than frame)
+ * @param sample frame position of new section. ignored if pls == MusicTime
+ * note that @sample may also be ignored if it would create an un-solvable map
+ * (previous audio-locked tempi may place the requested beat at an earlier time than sample)
* in which case the new meter will be placed at the specified BBT.
* @param pls the position lock style
*
* adding an audio-locked meter will add a meter-locked tempo section at the meter position.
* the meter-locked tempo tempo will be the Tempo at @beat
*/
- MeterSection* add_meter (const Meter& meter, const double& beat, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls);
+ MeterSection* add_meter (const Meter& meter, const Timecode::BBT_Time& where, samplepos_t sample, PositionLockStyle pls);
void remove_tempo (const TempoSection&, bool send_signal);
void remove_meter (const MeterSection&, bool send_signal);
- void replace_tempo (TempoSection&, const Tempo&, const double& pulse, const framepos_t& frame, PositionLockStyle pls);
+ void replace_tempo (TempoSection&, const Tempo&, const double& pulse, const samplepos_t sample, PositionLockStyle pls);
- void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls);
+ void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where, samplepos_t sample, PositionLockStyle pls);
- MusicFrame round_to_bar (framepos_t frame, RoundMode dir);
- MusicFrame round_to_beat (framepos_t frame, RoundMode dir);
- MusicFrame round_to_quarter_note_subdivision (framepos_t fr, int sub_num, RoundMode dir);
+ MusicSample round_to_bar (samplepos_t sample, RoundMode dir);
+ MusicSample round_to_beat (samplepos_t sample, RoundMode dir);
+ MusicSample round_to_quarter_note_subdivision (samplepos_t fr, int sub_num, RoundMode dir);
- void set_length (framepos_t frames);
+ void set_length (samplepos_t samples);
XMLNode& get_state (void);
int set_state (const XMLNode&, int version);
TempoMetric metric_at (Timecode::BBT_Time bbt) const;
- /** Return the TempoMetric at frame @p t, and point @p last to the latest
+ /** Return the TempoMetric at sample @p t, and point @p last to the latest
* metric change <= t, if it is non-NULL.
*/
- TempoMetric metric_at (framepos_t, Metrics::const_iterator* last=NULL) const;
+ TempoMetric metric_at (samplepos_t, Metrics::const_iterator* last=NULL) const;
Metrics::const_iterator metrics_end() { return _metrics.end(); }
- void change_existing_tempo_at (framepos_t, double bpm, double note_type, double end_ntpm);
+ void change_existing_tempo_at (samplepos_t, double bpm, double note_type, double end_ntpm);
void change_initial_tempo (double ntpm, double note_type, double end_ntpm);
- void insert_time (framepos_t, framecnt_t);
- bool remove_time (framepos_t where, framecnt_t amount); //returns true if anything was moved
+ void insert_time (samplepos_t, samplecnt_t);
+ bool remove_time (samplepos_t where, samplecnt_t amount); //returns true if anything was moved
int n_tempos () const;
int n_meters () const;
- framecnt_t frame_rate () const { return _frame_rate; }
+ samplecnt_t sample_rate () const { return _sample_rate; }
/* TEMPO- AND METER-SENSITIVE FUNCTIONS
- bbt_at_frame(), frame_at_bbt(), beat_at_frame(), frame_at_beat()
+ bbt_at_sample(), sample_at_bbt(), beat_at_sample(), sample_at_beat()
and bbt_duration_at()
are all sensitive to tempo and meter, and will give answers
that align with the grid formed by tempo and meter sections.
They SHOULD NOT be used to determine the position of events
- whose location is canonically defined in Evoral::Beats.
+ whose location is canonically defined in Temporal::Beats.
*/
- double beat_at_frame (const framecnt_t& frame) const;
- framepos_t frame_at_beat (const double& beat) const;
+ double beat_at_sample (const samplecnt_t sample) const;
+ samplepos_t sample_at_beat (const double& beat) const;
- const Meter& meter_at_frame (framepos_t) const;
+ const Meter& meter_at_sample (samplepos_t) const;
/* bbt - it's nearly always better to use meter-based beat (above)
unless tick resolution is desirable.
*/
- Timecode::BBT_Time bbt_at_frame (framepos_t when);
- Timecode::BBT_Time bbt_at_frame_rt (framepos_t when);
- framepos_t frame_at_bbt (const Timecode::BBT_Time&);
+ Timecode::BBT_Time bbt_at_sample (samplepos_t when);
+ Timecode::BBT_Time bbt_at_sample_rt (samplepos_t when);
+ samplepos_t sample_at_bbt (const Timecode::BBT_Time&);
double beat_at_bbt (const Timecode::BBT_Time& bbt);
Timecode::BBT_Time bbt_at_beat (const double& beats);
double quarter_note_at_bbt_rt (const Timecode::BBT_Time& bbt);
Timecode::BBT_Time bbt_at_quarter_note (const double& quarter_note);
- framecnt_t bbt_duration_at (framepos_t, const Timecode::BBT_Time&, int dir);
- framepos_t framepos_plus_bbt (framepos_t pos, Timecode::BBT_Time b) const;
+ samplecnt_t bbt_duration_at (samplepos_t, const Timecode::BBT_Time&, int dir);
+ samplepos_t samplepos_plus_bbt (samplepos_t pos, Timecode::BBT_Time b) const;
/* TEMPO-SENSITIVE FUNCTIONS
when tempo matters but meter does not.
They SHOULD be used to determine the position of events
- whose location is canonically defined in Evoral::Beats.
+ whose location is canonically defined in Temporal::Beats.
*/
- framepos_t framepos_plus_qn (framepos_t, Evoral::Beats) const;
- Evoral::Beats framewalk_to_qn (framepos_t pos, framecnt_t distance) const;
+ samplepos_t samplepos_plus_qn (samplepos_t, Temporal::Beats) const;
+ Temporal::Beats framewalk_to_qn (samplepos_t pos, samplecnt_t distance) const;
/* quarter note related functions are also tempo-sensitive and ignore meter.
- quarter notes may be compared with and assigned to Evoral::Beats.
+ quarter notes may be compared with and assigned to Temporal::Beats.
*/
- double quarter_note_at_frame (const framepos_t frame) const;
- double quarter_note_at_frame_rt (const framepos_t frame) const;
- framepos_t frame_at_quarter_note (const double quarter_note) const;
+ double quarter_note_at_sample (const samplepos_t sample) const;
+ double quarter_note_at_sample_rt (const samplepos_t sample) const;
+ samplepos_t sample_at_quarter_note (const double quarter_note) const;
- framecnt_t frames_between_quarter_notes (const double start, const double end) const;
- double quarter_notes_between_frames (const framecnt_t start, const framecnt_t end) const;
+ samplecnt_t samples_between_quarter_notes (const double start, const double end) const;
+ double quarter_notes_between_samples (const samplecnt_t start, const samplecnt_t end) const;
double quarter_note_at_beat (const double beat) const;
double beat_at_quarter_note (const double beat) const;
- /* obtain a musical subdivision via a frame position and magic note divisor.*/
- double exact_qn_at_frame (const framepos_t& frame, const int32_t sub_num) const;
- double exact_beat_at_frame (const framepos_t& frame, const int32_t sub_num) const;
+ /* obtain a musical subdivision via a sample position and magic note divisor.*/
+ double exact_qn_at_sample (const samplepos_t sample, const int32_t sub_num) const;
+ double exact_beat_at_sample (const samplepos_t sample, const int32_t sub_num) const;
- Tempo tempo_at_frame (const framepos_t& frame) const;
- framepos_t frame_at_tempo (const Tempo& tempo) const;
+ Tempo tempo_at_sample (const samplepos_t sample) const;
+ samplepos_t sample_at_tempo (const Tempo& tempo) const;
Tempo tempo_at_quarter_note (const double& beat) const;
double quarter_note_at_tempo (const Tempo& tempo) const;
- 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);
- 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);
+ void gui_set_tempo_position (TempoSection*, const samplepos_t sample, const int& sub_num);
+ void gui_set_meter_position (MeterSection*, const samplepos_t sample);
+ bool gui_change_tempo (TempoSection*, const Tempo& bpm);
+ void gui_stretch_tempo (TempoSection* tempo, const samplepos_t sample, const samplepos_t end_sample, const double start_qnote, const double end_qnote);
+ void gui_stretch_tempo_end (TempoSection* tempo, const samplepos_t sample, const samplepos_t end_sample);
+ bool gui_twist_tempi (TempoSection* first, const Tempo& bpm, const samplepos_t sample, const samplepos_t end_sample);
- std::pair<double, framepos_t> predict_tempo_position (TempoSection* section, const Timecode::BBT_Time& bbt);
+ std::pair<double, samplepos_t> predict_tempo_position (TempoSection* section, const Timecode::BBT_Time& bbt);
bool can_solve_bbt (TempoSection* section, const Timecode::BBT_Time& bbt);
PBD::Signal1<void,const PBD::PropertyChange&> MetricPositionChanged;
void fix_legacy_session();
void fix_legacy_end_session();
+ samplepos_t music_origin ();
+
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;
Timecode::BBT_Time bbt_at_pulse_locked (const Metrics& metrics, const double& pulse) const;
double minutes_between_quarter_notes_locked (const Metrics& metrics, const double start_qn, const double end_qn) const;
- double quarter_notes_between_frames_locked (const Metrics& metrics, const framecnt_t start, const framecnt_t end) const;
+ double quarter_notes_between_samples_locked (const Metrics& metrics, const samplecnt_t start, const samplecnt_t end) const;
const TempoSection& tempo_section_at_minute_locked (const Metrics& metrics, double minute) const;
TempoSection& tempo_section_at_minute_locked (const Metrics& metrics, double minute);
const MeterSection& meter_section_at_beat_locked (const Metrics& metrics, const double& beat) const;
bool check_solved (const Metrics& metrics) const;
- bool set_active_tempi (const Metrics& metrics, const framepos_t& frame);
+ bool set_active_tempi (const Metrics& metrics, const samplepos_t sample);
bool solve_map_minute (Metrics& metrics, TempoSection* section, const double& minute);
bool solve_map_pulse (Metrics& metrics, TempoSection* section, const double& pulse);
bool solve_map_minute (Metrics& metrics, MeterSection* section, const double& minute);
bool solve_map_bbt (Metrics& metrics, MeterSection* section, const Timecode::BBT_Time& bbt);
- double exact_beat_at_frame_locked (const Metrics& metrics, const framepos_t& frame, const int32_t sub_num) const;
- double exact_qn_at_frame_locked (const Metrics& metrics, const framepos_t& frame, const int32_t sub_num) const;
+ double exact_beat_at_sample_locked (const Metrics& metrics, const samplepos_t sample, const int32_t sub_num) const;
+ double exact_qn_at_sample_locked (const Metrics& metrics, const samplepos_t sample, const int32_t sub_num) const;
- double minute_at_frame (const framepos_t frame) const;
- framepos_t frame_at_minute (const double minute) const;
+ double minute_at_sample (const samplepos_t sample) const;
+ samplepos_t sample_at_minute (const double minute) const;
friend class ::BBTTest;
friend class ::FrameposPlusBeatsTest;
static Meter _default_meter;
Metrics _metrics;
- framecnt_t _frame_rate;
+ samplecnt_t _sample_rate;
mutable Glib::Threads::RWLock lock;
void recompute_tempi (Metrics& metrics);
void recompute_meters (Metrics& metrics);
- void recompute_map (Metrics& metrics, framepos_t end = -1);
+ void recompute_map (Metrics& metrics, samplepos_t end = -1);
- MusicFrame round_to_type (framepos_t fr, RoundMode dir, BBTPointType);
+ MusicSample round_to_type (samplepos_t fr, RoundMode dir, BBTPointType);
const MeterSection& first_meter() const;
MeterSection& first_meter();
void do_insert (MetricSection* section);
TempoSection* add_tempo_locked (const Tempo&, double pulse, double minute
- , PositionLockStyle pls, bool recompute, bool locked_to_meter = false);
+ , PositionLockStyle pls, bool recompute, bool locked_to_meter = false, bool clamped = false);
- MeterSection* add_meter_locked (const Meter&, double beat, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls, bool recompute);
+ MeterSection* add_meter_locked (const Meter&, const Timecode::BBT_Time& where, samplepos_t sample, PositionLockStyle pls, bool recompute);
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 */
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__ */
projects / ardour.git / blobdiff