comparison dsp/chromagram/Chromagram.cpp @ 34:ad645e404d0c

* Add range of normalise options to chromagram
* bit of tidying

 int Chromagram::initialise( ChromaConfig Config )
 {	
     m_FMin = Config.min;		// min freq
     m_FMax = Config.max;		// max freq
     m_BPO  = Config.BPO;		// bins per octave
-    isNormalised = Config.isNormalised; // true if frame normalisation is required
+    m_normalise = Config.normalise;     // if frame normalisation is required
 
     // No. of constant Q bins
     m_uK = ( unsigned int ) ceil( m_BPO * log(m_FMax/m_FMin)/log(2.0));	
 
     // Create array for chroma result

 	{
 	    m_chromadata[i] += kabs( m_CQRe[ firstBin + i ], m_CQIm[ firstBin + i ]);
 	}
     }
 
-    if( isNormalised )
-	unityNormalise( m_chromadata );
+    MathUtilities::normalise(m_chromadata, m_BPO, m_normalise);
 
     return m_chromadata;
 }