Mercurial > hg > svcore

diff data/model/WaveFileModel.cpp @ 927:5f021c13a4cc tony_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "tonioni"
author Chris Cannam
date Tue, 17 Jun 2014 12:54:51 +0100
parents 2896b8872834
children d03b3d956358
line wrap: on
line diff
--- a/data/model/WaveFileModel.cpp	Tue Jun 17 12:52:27 2014 +0100
+++ b/data/model/WaveFileModel.cpp	Tue Jun 17 12:54:51 2014 +0100
@@ -20,6 +20,8 @@
 
 #include "system/System.h"
 
+#include "base/Preferences.h"
+
 #include <QFileInfo>
 #include <QTextStream>
 
@@ -49,8 +51,9 @@
 {
     m_source.waitForData();
     if (m_source.isOK()) {
+        bool normalise = Preferences::getInstance()->getNormaliseAudio();
         m_reader = AudioFileReaderFactory::createThreadingReader
-            (m_source, targetRate);
+            (m_source, targetRate, normalise);
         if (m_reader) {
             SVDEBUG << "WaveFileModel::WaveFileModel: reader rate: "
                       << m_reader->getSampleRate() << endl;