summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/tempo.h
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-04-04 03:00:40 +1000
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:14 +1000
commit663814bf22a18964270598852ae406818bb863ba (patch)
tree062e7fb40bd58fb2cfe0ebeafc85d99d67cee104 /libs/ardour/ardour/tempo.h
parentc5790b1cb60f0c630c52c7cea60c68fcc2387e76 (diff)
Tempo ramps - tempo marks use mvc-style copy drag, don't crash if two successive ramped tempos are the same :|
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
-rw-r--r--libs/ardour/ardour/tempo.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index 98c6e82c16..1a37ecffe5 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -373,8 +373,8 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
const MeterSection& meter_section_at (framepos_t frame) const;
const MeterSection& meter_section_at (const double& beat) const;
- void add_tempo (const Tempo&, const double& pulse, TempoSection::Type type);
- void add_tempo (const Tempo&, const framepos_t& frame, TempoSection::Type type);
+ TempoSection* add_tempo (const Tempo&, const double& pulse, TempoSection::Type type);
+ TempoSection* add_tempo (const Tempo&, const framepos_t& frame, TempoSection::Type type);
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);
@@ -489,8 +489,8 @@ private:
void do_insert (MetricSection* section);
- void add_tempo_locked (const Tempo&, double pulse, bool recompute, TempoSection::Type type);
- void add_tempo_locked (const Tempo&, framepos_t frame, bool recompute, TempoSection::Type type);
+ 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);
MeterSection* add_meter_locked (const Meter&, double beat, Timecode::BBT_Time where, bool recompute);
MeterSection* add_meter_locked (const Meter&, framepos_t frame, double beat, Timecode::BBT_Time where, bool recompute);