summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/tempo.h
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-05-24 02:50:42 +1000
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:17 +1000
commitf54b75c869348501a4603bfe7adce46b50781b5b (patch)
treed4d94435c26dacf76d36b4d5b96a9f91ee662b50 /libs/ardour/ardour/tempo.h
parent8b2f73d5ac73c9f05000aa0204b033f9de0dd3c3 (diff)
Tempo ramps - consolidate meter dragging code.
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
-rw-r--r--libs/ardour/ardour/tempo.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index db618a4513..5416ad3462 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -399,10 +399,8 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
std::pair<double, framepos_t> predict_tempo_position (TempoSection* section, const Timecode::BBT_Time& bbt);
- void gui_move_tempo (TempoSection*, const std::pair<const double&, const framepos_t&>& pulse);
-
- void gui_move_meter_frame (MeterSection*, const framepos_t& frame);
- void gui_move_meter_bbt (MeterSection*, const Timecode::BBT_Time& bbt);
+ void gui_move_tempo (TempoSection*, const std::pair<double, framepos_t>& pulse);
+ void gui_move_meter (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, const double& pulse);
@@ -481,6 +479,7 @@ private:
bool check_solved (const Metrics& metrics) const;
bool set_active_tempos (const Metrics& metrics, const framepos_t& frame);
+
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);