comparison framework/MainWindowBase.cpp @ 360:88bf6cc73275 tonioni

For Tony, resample all audio to 44100 on load

 
     m_openingAudioFile = true;
 
     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();
     }
 
     WaveFileModel *newModel = new WaveFileModel(source, rate);
 

 MainWindowBase::mainModelChanged(WaveFileModel *model)
 {
 //    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
 MainWindowBase::modelAboutToBeDeleted(Model *model)
 {