comparison dsp/tonal/TonalEstimator.cpp @ 488:7992d0923626

Use M_PI

 #include "TonalEstimator.h"
 
 #include <cmath>
 #include <iostream>
 
-#ifndef PI
-#define PI (3.14159265358979232846)
-#endif
-
 TonalEstimator::TonalEstimator()
 {
     m_Basis.resize(6);
 
     int i = 0;
         
         
     // circle of fifths
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = std::sin( (7.0 / 6.0) * iP * PI);
+        m_Basis[i][iP] = std::sin( (7.0 / 6.0) * iP * M_PI);
     }
         
     i++;
 
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = std::cos( (7.0 / 6.0) * iP * PI);
+        m_Basis[i][iP] = std::cos( (7.0 / 6.0) * iP * M_PI);
     }
         
     i++;
         
         
     // circle of major thirds
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = 0.6 * std::sin( (2.0 / 3.0) * iP * PI);
+        m_Basis[i][iP] = 0.6 * std::sin( (2.0 / 3.0) * iP * M_PI);
     }
         
     i++;
 
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = 0.6 * std::cos( (2.0 / 3.0) * iP * PI);
+        m_Basis[i][iP] = 0.6 * std::cos( (2.0 / 3.0) * iP * M_PI);
     }
 
     i++;
 
 
     // circle of minor thirds
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = 1.1 * std::sin( (3.0 / 2.0) * iP * PI);
+        m_Basis[i][iP] = 1.1 * std::sin( (3.0 / 2.0) * iP * M_PI);
     }
         
     i++;
 
     m_Basis[i].resize(12);
     for (int iP = 0; iP < 12; iP++) {
-        m_Basis[i][iP] = 1.1 * std::cos( (3.0 / 2.0) * iP * PI);
+        m_Basis[i][iP] = 1.1 * std::cos( (3.0 / 2.0) * iP * M_PI);
     }
 
 }
 
 TonalEstimator::~TonalEstimator()