diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-01-07 01:27:06 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-01-07 01:27:06 +1100 |
| commit | d855ad28564541270c0c8317594c4a47f7613bef (patch) | |
| tree | 83d58ec635cf77ff3c4a239cd2acb6b8be720979 /libs/ardour/ardour | |
| parent | 4cb00905838ba6ae35317876ae8601a4076745ed (diff) | |
rename TempoSection::c_func() -> c(). ensure constant tempi have this set to 0.
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index f51f617a01..4516abcdda 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -190,7 +190,7 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo { }; TempoSection (const double& pulse, const double& minute, double qpm, double note_type, Type tempo_type, PositionLockStyle pls, framecnt_t sr) - : MetricSection (pulse, minute, pls, true, sr), Tempo (qpm, note_type), _type (tempo_type), _c_func (0.0), _active (true), _locked_to_meter (false) {} + : MetricSection (pulse, minute, pls, true, sr), Tempo (qpm, note_type), _type (tempo_type), _c (0.0), _active (true), _locked_to_meter (false) {} TempoSection (const XMLNode&, const framecnt_t sample_rate); @@ -198,8 +198,8 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo { XMLNode& get_state() const; - double c_func () const { return _c_func; } - void set_c_func (double c_func) { _c_func = c_func; } + double c () const { return _c; } + void set_c (double c) { _c = c; } void set_type (Type type); Type type () const { return _type; } @@ -254,7 +254,7 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo { position within the bar if/when the meter changes. */ Type _type; - double _c_func; + double _c; bool _active; bool _locked_to_meter; Timecode::BBT_Time _legacy_bbt; |