diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-01-06 02:20:45 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-01-06 02:20:45 +1100 |
| commit | 7138a0baa0964e07457d01fe0aa3aef99d4eaced (patch) | |
| tree | 5d509f740af3e5a6ed6f4eace58136cd607cbdf1 /libs/ardour/ardour/tempo.h | |
| parent | 3060a458eb092ac5dd5fb86c0d57e435671d8766 (diff) | |
prevent meter-locked tempi from being moved directly when replacing.
- the audio-locked meter owns it.
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index bd940f991a..f51f617a01 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -352,6 +352,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible double frames_per_quarter_note_at (const framepos_t&, const framecnt_t& sr) const; const TempoSection& tempo_section_at_frame (framepos_t frame) const; + TempoSection& tempo_section_at_frame (framepos_t frame); const MeterSection& meter_section_at_frame (framepos_t frame) const; const MeterSection& meter_section_at_beat (double beat) const; @@ -380,7 +381,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void remove_tempo (const TempoSection&, bool send_signal); void remove_meter (const MeterSection&, bool send_signal); - void replace_tempo (const TempoSection&, const Tempo&, const double& pulse, const framepos_t& frame + void replace_tempo (TempoSection&, const Tempo&, const double& pulse, const framepos_t& frame , TempoSection::Type type, PositionLockStyle pls); void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls); @@ -533,6 +534,7 @@ private: double quarter_notes_between_frames_locked (const Metrics& metrics, const framecnt_t start, const framecnt_t end) const; const TempoSection& tempo_section_at_minute_locked (const Metrics& metrics, double minute) const; + TempoSection& tempo_section_at_minute_locked (const Metrics& metrics, double minute); const TempoSection& tempo_section_at_beat_locked (const Metrics& metrics, const double& beat) const; const MeterSection& meter_section_at_minute_locked (const Metrics& metrics, double minute) const; |