comparison base/Pitch.cpp @ 141:4f26f623a8bc

* Finish preferences dialog (as far as it's going at the moment) and connect it up
* Fix Parzen window shape (was triangular!)
* Various fixes to spectrogram draw coordinates in smoothing mode etc
* Draw C keys in grey on the piano

     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
 
 #include "Pitch.h"
+#include "Preferences.h"
 
 #include <cmath>
 
 float
 Pitch::getFrequencyForPitch(int midiPitch,
 			    float centsOffset,
 			    float concertA)
 {
+    if (concertA <= 0.0) {
+        concertA = Preferences::getInstance()->getTuningFrequency();
+    }
     float p = float(midiPitch) + (centsOffset / 100);
     return concertA * powf(2.0, (p - 69.0) / 12.0);
 }
 
 int
 Pitch::getPitchForFrequency(float frequency,
 			    float *centsOffsetReturn,
 			    float concertA)
 {
+    if (concertA <= 0.0) {
+        concertA = Preferences::getInstance()->getTuningFrequency();
+    }
     float p = 12.0 * (log(frequency / (concertA / 2.0)) / log(2.0)) + 57.0;
 
     int midiPitch = int(p + 0.00001);
     float centsOffset = (p - midiPitch) * 100.0;
 

 QString
 Pitch::getPitchLabelForFrequency(float frequency,
 				 float concertA,
 				 bool useFlats)
 {
+    if (concertA <= 0.0) {
+        concertA = Preferences::getInstance()->getTuningFrequency();
+    }
     float centsOffset = 0.0;
     int midiPitch = getPitchForFrequency(frequency, &centsOffset, concertA);
     return getPitchLabel(midiPitch, centsOffset, useFlats);
 }