# HG changeset patch
# User Chris Cannam
# Date 1402660591 -3600
# Node ID 88bf6cc732754841ce451c75c3b3581ac8289e5d
# Parent  1f2a4ad79967cf85e976332a508d5161e386bd8d
For Tony, resample all audio to 44100 on load

diff -r 1f2a4ad79967 -r 88bf6cc73275 framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Fri Jun 13 10:37:04 2014 +0100
+++ b/framework/MainWindowBase.cpp	Fri Jun 13 12:56:31 2014 +0100
@@ -1219,7 +1219,9 @@
 
     size_t rate = 0;
 
-    if (Preferences::getInstance()->getResampleOnLoad()) {
+    if (Preferences::getInstance()->getFixedSampleRate() != 0) {
+        rate = Preferences::getInstance()->getFixedSampleRate();
+    } else if (Preferences::getInstance()->getResampleOnLoad()) {
         rate = m_playSource->getSourceSampleRate();
     }
 
@@ -3189,7 +3191,9 @@
 //    SVDEBUG << "MainWindowBase::mainModelChanged(" << model << ")" << endl;
     updateDescriptionLabel();
     if (model) m_viewManager->setMainModelSampleRate(model->getSampleRate());
-    if (model && !m_playTarget && m_audioOutput) createPlayTarget();
+    if (model && !m_playTarget && m_audioOutput) {
+        createPlayTarget();
+    }
 }
 
 void
diff -r 1f2a4ad79967 -r 88bf6cc73275 framework/SVFileReader.cpp
--- a/framework/SVFileReader.cpp	Fri Jun 13 10:37:04 2014 +0100
+++ b/framework/SVFileReader.cpp	Fri Jun 13 12:56:31 2014 +0100
@@ -475,8 +475,10 @@
 
             size_t rate = 0;
 
-            if (!mainModel &&
-                Preferences::getInstance()->getResampleOnLoad()) {
+            if (Preferences::getInstance()->getFixedSampleRate() != 0) {
+                rate = Preferences::getInstance()->getFixedSampleRate();
+            } else if (!mainModel &&
+                       Preferences::getInstance()->getResampleOnLoad()) {
                 WaveFileModel *mm = m_document->getMainModel();
                 if (mm) rate = mm->getSampleRate();
             }