comparison framework/SVFileReader.cpp @ 361:b38268e34c09 tonioni

The session file records the sample rate that each audio file was saved at. Use it.

This is a fix to part of https://code.soundsoftware.ac.uk/issues/970, but it also replaces the commit at https://code.soundsoftware.ac.uk/projects/svapp/repository/revisions/9554c19c42fd with a fix to the earlier bug http://sourceforge.net/p/sv1/bugs/107/. I think this is a better way than the earlier code.

             cerr << "SVFileReader::readModel: Failed to retrieve file \"" << path << "\" for wave file model: Source unavailable" << endl;
         } else {
 
             file.waitForData();
 
-            size_t rate = 0;
-
-            if (!mainModel &&
-                Preferences::getInstance()->getResampleOnLoad()) {
-                WaveFileModel *mm = m_document->getMainModel();
-                if (mm) rate = mm->getSampleRate();
+            size_t rate = sampleRate;
+
+            if (rate == 0) {
+                if (!mainModel &&
+                    Preferences::getInstance()->getResampleOnLoad()) {
+                    WaveFileModel *mm = m_document->getMainModel();
+                    if (mm) rate = mm->getSampleRate();
+                }
             }
 
             model = new WaveFileModel(file, rate);
             if (!model->isOK()) {
                 delete model;