diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-04-02 05:41:16 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:13 +1000 |
| commit | 3d07cd79e17f1bdda370f54c9ecece559af4d5f9 (patch) | |
| tree | 1b32dee23689db6c1657816da45c540cc1d58698 /libs/ardour/ardour/tempo.h | |
| parent | 89f022cb53cc1b983b1a9a0249a0e371a68055c0 (diff) | |
Tempo ramps - api change, remove some code.
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 6cb4850288..5ab4056c5e 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -382,19 +382,19 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void remove_tempo (const TempoSection&, bool send_signal); void remove_meter (const MeterSection&, bool send_signal); - framepos_t predict_tempo_frame (TempoSection* section, const Tempo& bpm, const Timecode::BBT_Time& bbt); - double predict_tempo_pulse (TempoSection* section, const Tempo& bpm, const framepos_t& frame); + 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 gui_move_tempo_frame (TempoSection*, const Tempo& bpm, const framepos_t& frame); - void gui_move_tempo_beat (TempoSection*, const Tempo& bpm, const double& frame); - void gui_move_meter (MeterSection*, const Meter& mt, const framepos_t& frame); - void gui_move_meter (MeterSection*, const Meter& mt, const double& beat); + void gui_move_tempo_frame (TempoSection*, const framepos_t& frame); + void gui_move_tempo_beat (TempoSection*, const double& frame); + void gui_move_meter (MeterSection*, const framepos_t& frame); + void gui_move_meter (MeterSection*, const double& beat); bool gui_change_tempo (TempoSection*, const Tempo& bpm); - bool can_solve_bbt (TempoSection* section, const Tempo& bpm, const Timecode::BBT_Time& bbt); + 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); @@ -460,10 +460,10 @@ private: bool check_solved (Metrics& metrics, bool by_frame); bool set_active_tempos (const Metrics& metrics, const framepos_t& frame); - bool solve_map (Metrics& metrics, TempoSection* section, const Tempo& bpm, const framepos_t& frame); - bool solve_map (Metrics& metrics, TempoSection* section, const Tempo& bpm, const double& pulse); - void solve_map (Metrics& metrics, MeterSection* section, const Meter& mt, const framepos_t& frame); - void solve_map (Metrics& metrics, MeterSection* section, const Meter& mt, const double& pulse); + bool solve_map (Metrics& metrics, TempoSection* section, const framepos_t& frame); + bool solve_map (Metrics& metrics, TempoSection* section, const double& pulse); + void solve_map (Metrics& metrics, MeterSection* section, const framepos_t& frame); + void solve_map (Metrics& metrics, MeterSection* section, const double& pulse); friend class ::BBTTest; friend class ::FrameposPlusBeatsTest; |