comparison runner/FeatureExtractionManager.cpp @ 116:1c0799754670

Normalise option (yet to be tested)

     // PluginBufferingAdapter handles this for us.  It's likely to be
     // quicker to use larger sizes than smallish ones like 1024
     m_blockSize(16384),
     m_defaultSampleRate(0),
     m_sampleRate(0),
-    m_channels(0)
+    m_channels(0),
+    m_normalise(false)
 {
 }
 
 FeatureExtractionManager::~FeatureExtractionManager()
 {

 }
 
 void FeatureExtractionManager::setDefaultSampleRate(int sampleRate)
 {
     m_defaultSampleRate = sampleRate;
+}
+
+void FeatureExtractionManager::setNormalise(bool normalise)
+{
+    m_normalise = normalise;
 }
 
 static PluginSummarisingAdapter::SummaryType
 getSummaryType(string name)
 {

 
         // Open to determine validity, channel count, sample rate only
         // (then close, and open again later with actual desired rate &c)
 
         AudioFileReader *reader =
-            AudioFileReaderFactory::createReader(source, 0, false,
+            AudioFileReaderFactory::createReader(source, 0, 
+                                                 m_normalise,
                                                  &retrievalProgress);
     
         if (!reader) {
             throw FailedToOpenFile(audioSource);
         }

     }
     if (!reader) {
         ProgressPrinter retrievalProgress("Retrieving audio data...");
         FileSource fs(source, &retrievalProgress);
         fs.waitForData();
-        reader = AudioFileReaderFactory::createReader
-            (fs, m_sampleRate, false, &retrievalProgress);
+        reader = AudioFileReaderFactory::createReader(fs, m_sampleRate, 
+                                                      m_normalise,
+                                                      &retrievalProgress);
         retrievalProgress.done();
     }
     if (!reader) {
         throw FailedToOpenFile(source);
     }