Mercurial > hg > qm-dsp
diff base/Pitch.cpp @ 505:930b5b0f707d
Merge branch 'codestyle-and-tidy'
author | Chris Cannam <cannam@all-day-breakfast.com> |
---|---|
date | Wed, 05 Jun 2019 12:55:15 +0100 |
parents | fdaa63607c15 |
children |
line wrap: on
line diff
--- a/base/Pitch.cpp Thu May 30 16:18:13 2019 +0100 +++ b/base/Pitch.cpp Wed Jun 05 12:55:15 2019 +0100 @@ -18,8 +18,8 @@ float Pitch::getFrequencyForPitch(int midiPitch, - float centsOffset, - float concertA) + float centsOffset, + float concertA) { float p = float(midiPitch) + (centsOffset / 100); return concertA * powf(2.0, (p - 69.0) / 12.0); @@ -27,8 +27,8 @@ int Pitch::getPitchForFrequency(float frequency, - float *centsOffsetReturn, - float concertA) + float *centsOffsetReturn, + float concertA) { float p = 12.0 * (log(frequency / (concertA / 2.0)) / log(2.0)) + 57.0; @@ -36,8 +36,8 @@ float centsOffset = (p - midiPitch) * 100.0; if (centsOffset >= 50.0) { - midiPitch = midiPitch + 1; - centsOffset = -(100.0 - centsOffset); + midiPitch = midiPitch + 1; + centsOffset = -(100.0 - centsOffset); } if (centsOffsetReturn) *centsOffsetReturn = centsOffset;