diff options
author | nick_m <mainsbridge@gmail.com> | 2016-12-19 04:13:17 +1100 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-12-19 04:13:17 +1100 |
commit | d4f7f5ffa2c6d531f8d4fbd04fcf12f2e3175cfb (patch) | |
tree | 12b2d61946906df91931734fae4af282fc03c9ae /libs | |
parent | 27b95300e2762566e766e0627e92ceb3b20f2efa (diff) |
TempoMap - rename some methods.
gui_move_tempo -> gui_set_tempo_position
gui_move_meter -> gui_set_meter_position
gui_dilate_tempo -> gui_stretch_tempo
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/tempo.h | 6 | ||||
-rw-r--r-- | libs/ardour/tempo.cc | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 5e5c8ad20f..627618d8c3 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -483,10 +483,10 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible Tempo tempo_at_quarter_note (const double& beat) const; double quarter_note_at_tempo (const Tempo& tempo) const; - void gui_move_tempo (TempoSection*, const framepos_t& frame, const int& sub_num); - void gui_move_meter (MeterSection*, const framepos_t& frame); + 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); - void gui_dilate_tempo (TempoSection* tempo, const framepos_t& frame, const framepos_t& end_frame); + void gui_stretch_tempo (TempoSection* tempo, const framepos_t& frame, const framepos_t& end_frame); std::pair<double, framepos_t> predict_tempo_position (TempoSection* section, const Timecode::BBT_Time& bbt); bool can_solve_bbt (TempoSection* section, const Timecode::BBT_Time& bbt); diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index b1befabd51..af2b8b2dbf 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1041,7 +1041,6 @@ TempoMap::do_insert (MetricSection* section) if (tempo) { bool const ipm = insert_tempo->position_lock_style() == MusicTime; - const bool tpm = tempo->position_lock_style() == MusicTime; const bool lm = insert_tempo->locked_to_meter(); if ((ipm && tempo->pulse() > insert_tempo->pulse()) || (!ipm && tempo->frame() > insert_tempo->frame()) || (lm && tempo->pulse() > insert_tempo->pulse())) { @@ -3211,7 +3210,7 @@ TempoMap::predict_tempo_position (TempoSection* section, const BBT_Time& bbt) * if sub_num is zero, the musical position will be taken from the supplied frame. */ void -TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int& sub_num) +TempoMap::gui_set_tempo_position (TempoSection* ts, const framepos_t& frame, const int& sub_num) { Metrics future_map; @@ -3284,7 +3283,7 @@ TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int& * leaving the meter position unchanged. */ void -TempoMap::gui_move_meter (MeterSection* ms, const framepos_t& frame) +TempoMap::gui_set_meter_position (MeterSection* ms, const framepos_t& frame) { Metrics future_map; @@ -3353,7 +3352,7 @@ TempoMap::gui_change_tempo (TempoSection* ts, const Tempo& bpm) } void -TempoMap::gui_dilate_tempo (TempoSection* ts, const framepos_t& frame, const framepos_t& end_frame) +TempoMap::gui_stretch_tempo (TempoSection* ts, const framepos_t& frame, const framepos_t& end_frame) { /* Ts (future prev_t) Tnext @@ -4397,11 +4396,11 @@ TempoMap::insert_time (framepos_t where, framecnt_t amount) TempoSection* ts; if ((ms = dynamic_cast <MeterSection*>(*i)) != 0) { - gui_move_meter (ms, (*i)->frame() + amount); + gui_set_meter_position (ms, (*i)->frame() + amount); } if ((ts = dynamic_cast <TempoSection*>(*i)) != 0) { - gui_move_tempo (ts, (*i)->frame() + amount, 0); + gui_set_tempo_position (ts, (*i)->frame() + amount, 0); } } } |