summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-11-09 00:48:00 +1100
committernick_m <mainsbridge@gmail.com>2016-11-11 03:37:08 +1100
commitb025f8e42a4eacd5429d0808f45c4d84cade7cb8 (patch)
tree3b070c980ddc78d3396c59bf4e191e006285786d /libs/ardour/ardour
parent0b7db6ebbb5dc297d9feeac3fac687c93651e6e4 (diff)
rename note_divisions_per_minute -> ote_types_per_minute (double note_type)
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/tempo.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index a35e1b4fba..ed3268145d 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -57,12 +57,12 @@ class LIBARDOUR_API Tempo {
: _note_types_per_minute (npm), _note_type(type) {}
double note_types_per_minute () const { return _note_types_per_minute; }
+ double note_types_per_minute (double note_type) const { return (_note_types_per_minute / _note_type) * note_type; }
void set_note_types_per_minute (double npm) { _note_types_per_minute = npm; }
double note_type () const { return _note_type; }
- double note_divisions_per_minute (double note_type) const { return _note_types_per_minute * (note_type / _note_type); }
- double quarter_notes_per_minute () const { return note_divisions_per_minute (4.0); }
- double pulses_per_minute () const { return note_divisions_per_minute (1.0); }
+ double quarter_notes_per_minute () const { return note_types_per_minute (4.0); }
+ double pulses_per_minute () const { return note_types_per_minute (1.0); }
/** audio samples per note type.
* if you want an instantaneous value for this, use TempoMap::frames_per_quarter_note_at() instead.
* @param sr samplerate