comparison src/FeatureExtractor.h @ 183:24ddab06aace re-minimise

Toward allowing types to be small again. Doesn't currently build

 */
 
 #ifndef FEATURE_EXTRACTOR_H
 #define FEATURE_EXTRACTOR_H
 
-#include <vector>
+#include "Types.h"
 
 /**
  * Convert frequency-domain audio frames into features suitable for
  * MATCH alignment calculation.
  *

      *
      * Operates by mapping the frequency bins into a part-linear
      * part-logarithmic array, unless useChromaFrequencyMap is true in
      * which case they are mapped into chroma bins.
      */
-    std::vector<double> process(const std::vector<double> &real,
-                                const std::vector<double> &imag);
+    feature_t process(const std::vector<double> &real,
+                      const std::vector<double> &imag);
     
     /**
      * Process one frequency-domain audio frame, provided as a single
      * array of alternating real and imaginary components. Input array
      * must have at least 2 * (params.fftSize/2 + 1) elements.
      *
      * Operates by mapping the frequency bins into a part-linear
      * part-logarithmic array, unless useChromaFrequencyMap is true in
      * which case they are mapped into chroma bins.
      */
-    std::vector<double> process(const float *carray);
+    std::feature_t process(const float *carray);
     
 protected:
     /** Make either standard or chroma map, depending on m_params */
     void makeFreqMap();
 

      *  range, it will be mapped to a target bin of -1 and should be
      *  discarded.
      */
     std::vector<int> m_freqMap;
 
-    std::vector<double> processMags(const std::vector<double> &mags);
+    feature_t processMags(const std::vector<double> &mags);
     std::vector<double> scaleMags(const std::vector<double> &mags);
     
     /** The size of a returned feature. */
     int m_featureSize;
 };