diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 73 | ||||
| -rw-r--r-- | libs/ardour/luabindings.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/tempo.cc | 113 | ||||
| -rw-r--r-- | libs/ardour/test/bbt_test.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/test/framepos_minus_beats_test.cc | 18 | ||||
| -rw-r--r-- | libs/ardour/test/framepos_plus_beats_test.cc | 18 | ||||
| -rw-r--r-- | libs/ardour/test/framewalk_to_beats_test.cc | 18 | ||||
| -rw-r--r-- | libs/ardour/test/midi_clock_slave_test.h | 4 | ||||
| -rw-r--r-- | libs/ardour/test/tempo_test.cc | 14 |
9 files changed, 140 insertions, 126 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 8b9b8b1bef..ec15993015 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -105,10 +105,8 @@ class LIBARDOUR_API Meter { /** 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 (MusicTime) {} - MetricSection (framepos_t frame) - : _pulse (0.0), _frame (frame), _movable (true), _position_lock_style (AudioTime) {} + MetricSection (double pulse, framepos_t frame, PositionLockStyle pls) + : _pulse (pulse), _frame (frame), _movable (true), _position_lock_style (pls) {} virtual ~MetricSection() {} @@ -142,10 +140,9 @@ private: /** 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, const Timecode::BBT_Time& bbt, double bpb, double note_type) - : MetricSection (frame), Meter (bpb, note_type), _bbt (bbt), _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; @@ -177,10 +174,9 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo { Constant, }; - TempoSection (const double& pulse, double qpm, double note_type, Type tempo_type) - : MetricSection (pulse), Tempo (qpm, note_type), _type (tempo_type), _c_func (0.0), _active (true), _locked_to_meter (false) {} - TempoSection (framepos_t frame, double qpm, double note_type, Type tempo_type) - : MetricSection (frame), Tempo (qpm, note_type), _type (tempo_type), _c_func (0.0), _active (true), _locked_to_meter (false) {} + 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; @@ -377,11 +373,28 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible const MeterSection& meter_section_at (framepos_t frame) const; const MeterSection& meter_section_at_beat (double beat) const; - TempoSection* add_tempo (const Tempo&, const double& pulse, TempoSection::Type type); - TempoSection* add_tempo (const Tempo&, const framepos_t& frame, TempoSection::Type type); + /** add a music-locked tempo section at pulse + * @param pulse pulse position of new section + */ + TempoSection* add_tempo_pulse (const Tempo&, const double& pulse, TempoSection::Type type); + + /** add an audio-locked tempo section at frame + * @param frame frame position of new section + */ + TempoSection* add_tempo_frame (const Tempo&, const framepos_t& frame, TempoSection::Type type); + + /** add a music-locked meter section at beat + * @param beat beat position of new section + * @param where bbt position of new section + */ + MeterSection* add_meter_beat (const Meter&, const double& beat, const Timecode::BBT_Time& where); - MeterSection* add_meter (const Meter&, const double& beat, const Timecode::BBT_Time& where); - MeterSection* add_meter (const Meter&, const framepos_t& frame, const double& beat, const Timecode::BBT_Time& where); + /** add an audio-locked meter section at frame + * @param frame frame position of new section + * @param beat beat position of new section + * @param where bbt position of new section + */ + MeterSection* add_meter_frame (const Meter&, const framepos_t& frame, const double& beat, const Timecode::BBT_Time& where); void remove_tempo (const TempoSection&, bool send_signal); void remove_meter (const MeterSection&, bool send_signal); @@ -389,21 +402,21 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible framepos_t predict_tempo_frame (TempoSection* section, const Timecode::BBT_Time& bbt); double predict_tempo_pulse (TempoSection* section, const framepos_t& frame); - 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_tempo_pulse (const TempoSection&, const Tempo&, const double& where, TempoSection::Type type); + void replace_tempo_frame (const TempoSection&, const Tempo&, const framepos_t& frame, TempoSection::Type type); void gui_move_tempo_frame (TempoSection*, const framepos_t& frame); void gui_move_tempo_beat (TempoSection*, const double& beat); - void gui_move_meter (MeterSection*, const framepos_t& frame); - void gui_move_meter (MeterSection*, const Timecode::BBT_Time& bbt); + void gui_move_meter_frame (MeterSection*, const framepos_t& frame); + void gui_move_meter_bbt (MeterSection*, const Timecode::BBT_Time& bbt); bool gui_change_tempo (TempoSection*, const Tempo& bpm); void gui_dilate_tempo (MeterSection*, const framepos_t& frame); 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); - void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where); - void replace_meter (const MeterSection&, const Meter&, const framepos_t& frame); + void replace_meter_bbt (const MeterSection&, const Meter&, const Timecode::BBT_Time& where); + void replace_meter_frame (const MeterSection&, const Meter&, const framepos_t& frame); framepos_t round_to_bar (framepos_t frame, RoundMode dir); framepos_t round_to_beat (framepos_t frame, RoundMode dir); @@ -474,10 +487,10 @@ private: bool check_solved (const Metrics& metrics, bool by_frame) const; bool set_active_tempos (const Metrics& metrics, const framepos_t& frame); - bool solve_map (Metrics& metrics, TempoSection* section, const framepos_t& frame); - bool solve_map (Metrics& metrics, TempoSection* section, const double& pulse); - bool solve_map (Metrics& metrics, MeterSection* section, const framepos_t& frame); - bool solve_map (Metrics& metrics, MeterSection* section, const Timecode::BBT_Time& bbt); + 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; @@ -503,11 +516,11 @@ private: void do_insert (MetricSection* section); - TempoSection* add_tempo_locked (const Tempo&, double pulse, bool recompute, TempoSection::Type type); - TempoSection* add_tempo_locked (const Tempo&, framepos_t frame, bool recompute, TempoSection::Type type); + TempoSection* add_tempo_pulse_locked (const Tempo&, double pulse, bool recompute, TempoSection::Type type); + TempoSection* add_tempo_frame_locked (const Tempo&, framepos_t frame, bool recompute, TempoSection::Type type); - MeterSection* add_meter_locked (const Meter&, double beat, const Timecode::BBT_Time& where, bool recompute); - MeterSection* add_meter_locked (const Meter&, framepos_t frame, double beat, const Timecode::BBT_Time& where, bool recompute); + MeterSection* add_meter_beat_locked (const Meter&, double beat, const Timecode::BBT_Time& where, bool recompute); + MeterSection* add_meter_frame_locked (const Meter&, framepos_t frame, double beat, const Timecode::BBT_Time& where, bool recompute); bool remove_tempo_locked (const TempoSection&); bool remove_meter_locked (const MeterSection&); diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index 092a17fd55..8d46d9e762 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -832,8 +832,10 @@ LuaBindings::common (lua_State* L) .endClass () .beginClass <TempoMap> ("TempoMap") - //.addFunction ("add_tempo", &TempoMap::add_tempo) - //.addFunction ("add_meter", &TempoMap::add_meter) + .addFunction ("add_tempo_pulse", &TempoMap::add_tempo_pulse) + .addFunction ("add_tempo_frame", &TempoMap::add_tempo_frame) + .addFunction ("add_meter_beat", &TempoMap::add_meter_beat) + .addFunction ("add_meter_frame", &TempoMap::add_meter_frame) .endClass () .beginClass <ChanCount> ("ChanCount") diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 07343e0a69..07ff3166f2 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -73,7 +73,7 @@ Meter::frames_per_bar (const Tempo& tempo, framecnt_t sr) const const string TempoSection::xml_state_node_name = "Tempo"; TempoSection::TempoSection (const XMLNode& node) - : MetricSection (0.0) + : MetricSection (0.0, 0, MusicTime) , Tempo (TempoMap::default_tempo()) , _c_func (0.0) , _active (true) @@ -453,7 +453,7 @@ TempoSection::time_at_pulse (const double& pulse) const const string MeterSection::xml_state_node_name = "Meter"; MeterSection::MeterSection (const XMLNode& node) - : MetricSection (0.0), Meter (TempoMap::default_meter()) + : MetricSection (0.0, 0, MusicTime), Meter (TempoMap::default_meter()) { XMLProperty const * prop; LocaleGuard lg; @@ -637,8 +637,8 @@ TempoMap::TempoMap (framecnt_t fr) _frame_rate = fr; BBT_Time start (1, 1, 0); - TempoSection *t = new TempoSection ((framepos_t) 0, _default_tempo.beats_per_minute(), _default_tempo.note_type(), TempoSection::Constant); - MeterSection *m = new MeterSection ((framepos_t) 0, 0.0, start, _default_meter.divisions_per_bar(), _default_meter.note_divisor()); + TempoSection *t = new TempoSection (0.0, 0, _default_tempo.beats_per_minute(), _default_tempo.note_type(), TempoSection::Constant, AudioTime); + MeterSection *m = new MeterSection (0.0, 0, 0.0, start, _default_meter.divisions_per_bar(), _default_meter.note_divisor(), AudioTime); t->set_movable (false); m->set_movable (false); @@ -882,14 +882,14 @@ TempoMap::do_insert (MetricSection* section) } void -TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const double& pulse, TempoSection::Type type) +TempoMap::replace_tempo_pulse (const TempoSection& ts, const Tempo& tempo, const double& pulse, TempoSection::Type type) { { Glib::Threads::RWLock::WriterLock lm (lock); TempoSection& first (first_tempo()); if (ts.pulse() != first.pulse()) { remove_tempo_locked (ts); - add_tempo_locked (tempo, pulse, true, type); + add_tempo_pulse_locked (tempo, pulse, true, type); } else { first.set_type (type); { @@ -904,14 +904,14 @@ TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const doubl } void -TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const framepos_t& frame, TempoSection::Type type) +TempoMap::replace_tempo_frame (const TempoSection& ts, const Tempo& tempo, const framepos_t& frame, TempoSection::Type type) { { Glib::Threads::RWLock::WriterLock lm (lock); TempoSection& first (first_tempo()); if (ts.frame() != first.frame()) { remove_tempo_locked (ts); - add_tempo_locked (tempo, frame, true, type); + add_tempo_frame_locked (tempo, frame, true, type); } else { first.set_type (type); first.set_pulse (0.0); @@ -928,12 +928,12 @@ TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const frame } TempoSection* -TempoMap::add_tempo (const Tempo& tempo, const double& pulse, ARDOUR::TempoSection::Type type) +TempoMap::add_tempo_pulse (const Tempo& tempo, const double& pulse, ARDOUR::TempoSection::Type type) { TempoSection* ts = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - ts = add_tempo_locked (tempo, pulse, true, type); + ts = add_tempo_pulse_locked (tempo, pulse, true, type); } PropertyChanged (PropertyChange ()); @@ -942,12 +942,12 @@ TempoMap::add_tempo (const Tempo& tempo, const double& pulse, ARDOUR::TempoSecti } TempoSection* -TempoMap::add_tempo (const Tempo& tempo, const framepos_t& frame, ARDOUR::TempoSection::Type type) +TempoMap::add_tempo_frame (const Tempo& tempo, const framepos_t& frame, ARDOUR::TempoSection::Type type) { TempoSection* ts = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - ts = add_tempo_locked (tempo, frame, true, type); + ts = add_tempo_frame_locked (tempo, frame, true, type); } @@ -957,14 +957,14 @@ TempoMap::add_tempo (const Tempo& tempo, const framepos_t& frame, ARDOUR::TempoS } TempoSection* -TempoMap::add_tempo_locked (const Tempo& tempo, double pulse, bool recompute, ARDOUR::TempoSection::Type type) +TempoMap::add_tempo_pulse_locked (const Tempo& tempo, double pulse, bool recompute, ARDOUR::TempoSection::Type type) { - TempoSection* t = new TempoSection (pulse, tempo.beats_per_minute(), tempo.note_type(), type); + TempoSection* t = new TempoSection (pulse, 0, tempo.beats_per_minute(), tempo.note_type(), type, MusicTime); do_insert (t); if (recompute) { - solve_map (_metrics, t, t->pulse()); + solve_map_pulse (_metrics, t, t->pulse()); recompute_meters (_metrics); } @@ -972,14 +972,14 @@ TempoMap::add_tempo_locked (const Tempo& tempo, double pulse, bool recompute, AR } TempoSection* -TempoMap::add_tempo_locked (const Tempo& tempo, framepos_t frame, bool recompute, ARDOUR::TempoSection::Type type) +TempoMap::add_tempo_frame_locked (const Tempo& tempo, framepos_t frame, bool recompute, ARDOUR::TempoSection::Type type) { - TempoSection* t = new TempoSection (frame, tempo.beats_per_minute(), tempo.note_type(), type); + TempoSection* t = new TempoSection (0.0, frame, tempo.beats_per_minute(), tempo.note_type(), type, AudioTime); do_insert (t); if (recompute) { - solve_map (_metrics, t, t->frame()); + solve_map_frame (_metrics, t, t->frame()); recompute_meters (_metrics); } @@ -987,14 +987,14 @@ TempoMap::add_tempo_locked (const Tempo& tempo, framepos_t frame, bool recompute } void -TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_Time& where) +TempoMap::replace_meter_bbt (const MeterSection& ms, const Meter& meter, const BBT_Time& where) { { Glib::Threads::RWLock::WriterLock lm (lock); if (ms.movable()) { remove_meter_locked (ms); - add_meter_locked (meter, bbt_to_beats_locked (_metrics, where), where, true); + add_meter_beat_locked (meter, bbt_to_beats_locked (_metrics, where), where, true); } else { MeterSection& first (first_meter()); /* cannot move the first meter section */ @@ -1008,7 +1008,7 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T } void -TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const framepos_t& frame) +TempoMap::replace_meter_frame (const MeterSection& ms, const Meter& meter, const framepos_t& frame) { { Glib::Threads::RWLock::WriterLock lm (lock); @@ -1018,7 +1018,7 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const frame if (ms.movable()) { remove_meter_locked (ms); - add_meter_locked (meter, frame, beat, bbt, true); + add_meter_frame_locked (meter, frame, beat, bbt, true); } else { MeterSection& first (first_meter()); TempoSection& first_t (first_tempo()); @@ -1040,12 +1040,12 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const frame MeterSection* -TempoMap::add_meter (const Meter& meter, const double& beat, const BBT_Time& where) +TempoMap::add_meter_beat (const Meter& meter, const double& beat, const BBT_Time& where) { MeterSection* m = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - m = add_meter_locked (meter, beat, where, true); + m = add_meter_beat_locked (meter, beat, where, true); } @@ -1061,12 +1061,12 @@ TempoMap::add_meter (const Meter& meter, const double& beat, const BBT_Time& whe } MeterSection* -TempoMap::add_meter (const Meter& meter, const framepos_t& frame, const double& beat, const Timecode::BBT_Time& where) +TempoMap::add_meter_frame (const Meter& meter, const framepos_t& frame, const double& beat, const Timecode::BBT_Time& where) { MeterSection* m = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - m = add_meter_locked (meter, frame, beat, where, true); + m = add_meter_frame_locked (meter, frame, beat, where, true); } @@ -1082,7 +1082,7 @@ TempoMap::add_meter (const Meter& meter, const framepos_t& frame, const double& } MeterSection* -TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& where, bool recompute) +TempoMap::add_meter_beat_locked (const Meter& meter, double beat, const BBT_Time& where, bool recompute) { /* a new meter always starts a new bar on the first beat. so round the start time appropriately. remember that @@ -1092,35 +1092,34 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& whe */ const double pulse = pulse_at_beat_locked (_metrics, beat); - MeterSection* new_meter = new MeterSection (pulse, beat, where, meter.divisions_per_bar(), meter.note_divisor()); + MeterSection* new_meter = new MeterSection (pulse, 0, beat, where, meter.divisions_per_bar(), meter.note_divisor(), MusicTime); do_insert (new_meter); if (recompute) { - solve_map (_metrics, new_meter, where); + solve_map_bbt (_metrics, new_meter, where); } return new_meter; } MeterSection* -TempoMap::add_meter_locked (const Meter& meter, framepos_t frame, double beat, const Timecode::BBT_Time& where, bool recompute) +TempoMap::add_meter_frame_locked (const Meter& meter, framepos_t frame, double beat, const Timecode::BBT_Time& where, bool recompute) { /* add meter-locked tempo */ - TempoSection* t = add_tempo_locked (tempo_at_locked (_metrics, frame), frame, true, TempoSection::Ramp); + TempoSection* t = add_tempo_frame_locked (tempo_at_locked (_metrics, frame), frame, true, TempoSection::Ramp); if (t) { t->set_locked_to_meter (true); } - MeterSection* new_meter = new MeterSection (frame, beat, where, meter.divisions_per_bar(), meter.note_divisor()); + MeterSection* new_meter = new MeterSection (0.0, frame, beat, where, meter.divisions_per_bar(), meter.note_divisor(), AudioTime); new_meter->set_pulse (pulse_at_frame_locked (_metrics, frame)); do_insert (new_meter); if (recompute) { - solve_map (_metrics, new_meter, frame); + solve_map_frame (_metrics, new_meter, frame); } - return new_meter; } @@ -1933,7 +1932,7 @@ TempoMap::set_active_tempos (const Metrics& metrics, const framepos_t& frame) } bool -TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const framepos_t& frame) +TempoMap::solve_map_frame (Metrics& imaginary, TempoSection* section, const framepos_t& frame) { TempoSection* prev_t = 0; TempoSection* section_prev = 0; @@ -2020,7 +2019,7 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const framepos_t } bool -TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const double& pulse) +TempoMap::solve_map_pulse (Metrics& imaginary, TempoSection* section, const double& pulse) { TempoSection* prev_t = 0; TempoSection* section_prev = 0; @@ -2093,7 +2092,7 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const double& pu } bool -TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const framepos_t& frame) +TempoMap::solve_map_frame (Metrics& imaginary, MeterSection* section, const framepos_t& frame) { /* disallow moving first meter past any subsequent one, and any movable meter before the first one */ const MeterSection* other = &meter_section_at_locked (imaginary, frame); @@ -2145,9 +2144,9 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const framepos_t const double new_pulse = ((section->beat() - prev_m->beat()) / prev_m->note_divisor()) + prev_m->pulse(); const framepos_t smallest_frame = frame_at_pulse_locked (future_map, new_pulse); - if ((solved = solve_map (future_map, tempo_copy, smallest_frame))) { + if ((solved = solve_map_frame (future_map, tempo_copy, smallest_frame))) { meter_locked_tempo->set_pulse (new_pulse); - solve_map (imaginary, meter_locked_tempo, smallest_frame); + solve_map_frame (imaginary, meter_locked_tempo, smallest_frame); section->set_frame (smallest_frame); section->set_pulse (new_pulse); } else { @@ -2174,11 +2173,11 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const framepos_t MeterSection* meter_copy = const_cast<MeterSection*> (&meter_section_at_locked (future_map, section->frame())); meter_copy->set_frame (frame); - if ((solved = solve_map (future_map, tempo_copy, frame))) { + if ((solved = solve_map_frame (future_map, tempo_copy, frame))) { section->set_frame (frame); meter_locked_tempo->set_pulse (((section->beat() - prev_m->beat()) / prev_m->note_divisor()) + prev_m->pulse()); - solve_map (imaginary, meter_locked_tempo, frame); + solve_map_frame (imaginary, meter_locked_tempo, frame); } else { solved = false; } @@ -2204,11 +2203,11 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const framepos_t tempo_copy->set_frame (frame); tempo_copy->set_pulse (0.0); - if ((solved = solve_map (future_map, tempo_copy, frame))) { + if ((solved = solve_map_frame (future_map, tempo_copy, frame))) { section->set_frame (frame); meter_locked_tempo->set_frame (frame); meter_locked_tempo->set_pulse (0.0); - solve_map (imaginary, meter_locked_tempo, frame); + solve_map_frame (imaginary, meter_locked_tempo, frame); } else { solved = false; } @@ -2253,7 +2252,7 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const framepos_t } bool -TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const BBT_Time& when) +TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Time& when) { /* disallow setting section to an existing meter's bbt */ for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) { @@ -2440,7 +2439,7 @@ TempoMap::can_solve_bbt (TempoSection* ts, const BBT_Time& bbt) } const double beat = bbt_to_beats_locked (copy, bbt); - const bool ret = solve_map (copy, tempo_copy, pulse_at_beat_locked (copy, beat)); + const bool ret = solve_map_pulse (copy, tempo_copy, pulse_at_beat_locked (copy, beat)); Metrics::const_iterator d = copy.begin(); while (d != copy.end()) { @@ -2471,7 +2470,7 @@ TempoMap::predict_tempo_frame (TempoSection* section, const BBT_Time& bbt) } const double beat = bbt_to_beats_locked (future_map, bbt); - if (solve_map (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) { + if (solve_map_pulse (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) { ret = tempo_copy->frame(); } else { ret = section->frame(); @@ -2493,7 +2492,7 @@ TempoMap::predict_tempo_pulse (TempoSection* section, const framepos_t& frame) double ret = 0.0; TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, section); - if (solve_map (future_map, tempo_copy, frame)) { + if (solve_map_frame (future_map, tempo_copy, frame)) { ret = tempo_copy->pulse(); } else { ret = section->pulse(); @@ -2514,8 +2513,8 @@ TempoMap::gui_move_tempo_frame (TempoSection* ts, const framepos_t& frame) { Glib::Threads::RWLock::WriterLock lm (lock); TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts); - if (solve_map (future_map, tempo_copy, frame)) { - solve_map (_metrics, ts, frame); + if (solve_map_frame (future_map, tempo_copy, frame)) { + solve_map_frame (_metrics, ts, frame); recompute_meters (_metrics); } } @@ -2536,8 +2535,8 @@ TempoMap::gui_move_tempo_beat (TempoSection* ts, const double& beat) { Glib::Threads::RWLock::WriterLock lm (lock); TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts); - if (solve_map (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) { - solve_map (_metrics, ts, pulse_at_beat_locked (_metrics, beat)); + if (solve_map_pulse (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) { + solve_map_pulse (_metrics, ts, pulse_at_beat_locked (_metrics, beat)); recompute_meters (_metrics); } } @@ -2552,14 +2551,14 @@ TempoMap::gui_move_tempo_beat (TempoSection* ts, const double& beat) } void -TempoMap::gui_move_meter (MeterSection* ms, const framepos_t& frame) +TempoMap::gui_move_meter_frame (MeterSection* ms, const framepos_t& frame) { Metrics future_map; { Glib::Threads::RWLock::WriterLock lm (lock); MeterSection* copy = copy_metrics_and_point (_metrics, future_map, ms); - if (solve_map (future_map, copy, frame)) { - solve_map (_metrics, ms, frame); + if (solve_map_frame (future_map, copy, frame)) { + solve_map_frame (_metrics, ms, frame); recompute_tempos (_metrics); } } @@ -2574,14 +2573,14 @@ TempoMap::gui_move_meter (MeterSection* ms, const framepos_t& frame) } void -TempoMap::gui_move_meter (MeterSection* ms, const Timecode::BBT_Time& bbt) +TempoMap::gui_move_meter_bbt (MeterSection* ms, const Timecode::BBT_Time& bbt) { Metrics future_map; { Glib::Threads::RWLock::WriterLock lm (lock); MeterSection* copy = copy_metrics_and_point (_metrics, future_map, ms); - if (solve_map (future_map, copy, bbt)) { - solve_map (_metrics, ms, bbt); + if (solve_map_bbt (future_map, copy, bbt)) { + solve_map_bbt (_metrics, ms, bbt); recompute_tempos (_metrics); } } diff --git a/libs/ardour/test/bbt_test.cc b/libs/ardour/test/bbt_test.cc index 507af574d2..9249c0f175 100644 --- a/libs/ardour/test/bbt_test.cc +++ b/libs/ardour/test/bbt_test.cc @@ -16,7 +16,7 @@ BBTTest::addTest () Tempo tempo(120); Meter meter(4.0, 4.0); - map.add_meter (meter, 0.0, BBT_Time(1, 1, 0)); + map.add_meter_beat (meter, 0.0, BBT_Time(1, 1, 0)); /* add some good stuff here */ } diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc index 6982529bf6..acdcd428fd 100644 --- a/libs/ardour/test/framepos_minus_beats_test.cc +++ b/libs/ardour/test/framepos_minus_beats_test.cc @@ -22,8 +22,8 @@ FrameposMinusBeatsTest::singleTempoTest () Tempo tempo (bpm); Meter meter (4, 4); - map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); - map.add_tempo (tempo, 0.0, TempoSection::Constant); + map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_tempo_pulse (tempo, 0.0, TempoSection::Constant); /* Subtract 1 beat from beat 3 of the first bar */ framepos_t r = map.framepos_minus_beats (frames_per_beat * 2, Beats(1)); @@ -42,7 +42,7 @@ FrameposMinusBeatsTest::doubleTempoTest () TempoMap map (sampling_rate); Meter meter (4, 4); - map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 4 @@ -64,9 +64,9 @@ FrameposMinusBeatsTest::doubleTempoTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, 0.0, TempoSection::Constant); + map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); + map.add_tempo_pulse (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); /* Now some tests */ @@ -95,7 +95,7 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () TempoMap map (sampling_rate); Meter meterA (4, 4); - map.add_meter (meterA, 0.0, BBT_Time (1, 1, 0)); + map.add_meter_beat (meterA, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 4 @@ -117,11 +117,11 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, 0.0, TempoSection::Constant); + map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); + map.add_tempo_pulse (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); Meter meterB (3, 4); - map.add_meter (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0)); + map.add_meter_beat (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0)); /* Now some tests */ diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index f31f73da20..faf304ca82 100644 --- a/libs/ardour/test/framepos_plus_beats_test.cc +++ b/libs/ardour/test/framepos_plus_beats_test.cc @@ -21,8 +21,8 @@ FrameposPlusBeatsTest::singleTempoTest () Tempo tempo (bpm); Meter meter (4, 4); - map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); - map.add_tempo (tempo, 0.0, TempoSection::Constant); + map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_tempo_pulse (tempo, 0.0, TempoSection::Constant); /* Add 1 beat to beat 3 of the first bar */ framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, Evoral::Beats(1)); @@ -41,7 +41,7 @@ FrameposPlusBeatsTest::doubleTempoTest () TempoMap map (sampling_rate); Meter meter (4, 4); - map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 4 @@ -63,9 +63,9 @@ FrameposPlusBeatsTest::doubleTempoTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, 0.0, TempoSection::Constant); + map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); + map.add_tempo_pulse (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); /* Now some tests */ @@ -94,7 +94,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () TempoMap map (sampling_rate); Meter meterA (4, 4); - map.add_meter (meterA, 0.0, BBT_Time (1, 1, 0)); + map.add_meter_beat (meterA, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 4 @@ -116,11 +116,11 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, 0.0, TempoSection::Constant); + map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); + map.add_tempo_pulse (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); Meter meterB (3, 4); - map.add_meter (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0)); + map.add_meter_beat (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0)); /* Now some tests */ diff --git a/libs/ardour/test/framewalk_to_beats_test.cc b/libs/ardour/test/framewalk_to_beats_test.cc index f895cfb1a4..950789d440 100644 --- a/libs/ardour/test/framewalk_to_beats_test.cc +++ b/libs/ardour/test/framewalk_to_beats_test.cc @@ -20,8 +20,8 @@ FramewalkToBeatsTest::singleTempoTest () Tempo tempo (bpm); Meter meter (4, 4); - map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); - map.add_tempo (tempo, 0.0, TempoSection::Constant); + map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_tempo_pulse (tempo, 0.0, TempoSection::Constant); /* Walk 1 beats-worth of frames from beat 3 */ double r = map.framewalk_to_beats (frames_per_beat * 2, frames_per_beat * 1).to_double(); @@ -47,7 +47,7 @@ FramewalkToBeatsTest::doubleTempoTest () TempoMap map (sampling_rate); Meter meter (4, 4); - map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 4 @@ -71,9 +71,9 @@ FramewalkToBeatsTest::doubleTempoTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, 0.0, TempoSection::Constant); + map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, 12.0 / tempoB.note_type(), TempoSection::Constant); + map.add_tempo_pulse (tempoB, 12.0 / tempoB.note_type(), TempoSection::Constant); /* Now some tests */ @@ -104,7 +104,7 @@ FramewalkToBeatsTest::tripleTempoTest () TempoMap map (sampling_rate); Meter meter (4, 4); - map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 2, 160bpm at bar 3 @@ -127,11 +127,11 @@ FramewalkToBeatsTest::tripleTempoTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, 0.0, TempoSection::Constant); + map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, 4.0 / tempoB.note_type(), TempoSection::Constant); + map.add_tempo_pulse (tempoB, 4.0 / tempoB.note_type(), TempoSection::Constant); Tempo tempoC (160); - map.add_tempo (tempoC, 8.0 / tempoB.note_type(), TempoSection::Constant); + map.add_tempo_pulse (tempoC, 8.0 / tempoB.note_type(), TempoSection::Constant); /* Walk from 1|3 to 4|1 */ double r = map.framewalk_to_beats (2 * 24e3, (2 * 24e3) + (4 * 12e3) + (4 * 18e3)).to_double(); diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h index ba87f8892a..9b61d2c807 100644 --- a/libs/ardour/test/midi_clock_slave_test.h +++ b/libs/ardour/test/midi_clock_slave_test.h @@ -48,8 +48,8 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy { meter (4.0, 4.0) { _tempo_map = new TempoMap (FRAME_RATE); - _tempo_map->add_tempo (tempo, 0.0, TempoSection::Type::Constant); - _tempo_map->add_meter (meter, 0.0, Timecode::BBT_Time(1, 1, 0)); + _tempo_map->add_tempo_pulse (tempo, 0.0, TempoSection::Type::Constant); + _tempo_map->add_meter_beat (meter, 0.0, Timecode::BBT_Time(1, 1, 0)); } // Controlling the mock object diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc index 0160708542..621a72dd96 100644 --- a/libs/ardour/test/tempo_test.cc +++ b/libs/ardour/test/tempo_test.cc @@ -14,7 +14,7 @@ TempoTest::recomputeMapTest () TempoMap map (sampling_rate); Meter meterA (4, 4); - map.add_meter (meterA, 0.0, BBT_Time (1, 1, 0)); + map.add_meter_beat (meterA, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 4 @@ -36,11 +36,11 @@ TempoTest::recomputeMapTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, 0.0, TempoSection::Constant); + map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, 12.0, TempoSection::Constant); + map.add_tempo_pulse (tempoB, 4.0, TempoSection::Constant); Meter meterB (3, 4); - map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0)); + map.add_meter_beat (meterB, 12.0, BBT_Time (4, 1, 0)); list<MetricSection*>::iterator i = map._metrics.begin(); CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ()); @@ -59,9 +59,9 @@ TempoTest::rampTest () Meter meterA (4, 4); Tempo tempoA (77.0, 4.0); Tempo tempoB (217.0, 4.0); - map.add_tempo (tempoA, (framepos_t) 0, TempoSection::Ramp); - map.add_tempo (tempoB, (framepos_t) 60 * sampling_rate, TempoSection::Ramp); - map.add_meter (meterA, 0.0, BBT_Time (1, 1, 0)); + map.add_tempo_frame (tempoA, (framepos_t) 0, TempoSection::Ramp); + map.add_tempo_frame (tempoB, (framepos_t) 60 * sampling_rate, TempoSection::Ramp); + map.add_meter_beat (meterA, 0.0, BBT_Time (1, 1, 0)); /* |