Mercurial > hg > svapp

diff framework/SVFileReader.cpp @ 441:aa6fb3516e28 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from cxx11 branch
author Chris Cannam
date Mon, 23 Mar 2015 11:26:28 +0000
parents 72c662fe7ea3
children 1c17a2c5e917
line wrap: on
line diff
--- a/framework/SVFileReader.cpp	Mon Mar 23 10:04:57 2015 +0000
+++ b/framework/SVFileReader.cpp	Mon Mar 23 11:26:28 2015 +0000
@@ -450,7 +450,7 @@
 
     SVDEBUG << "SVFileReader::readModel: model name \"" << name << "\"" << endl;
 
-    READ_MANDATORY(int, sampleRate, toInt);
+    READ_MANDATORY(double, sampleRate, toDouble);
 
     QString type = attributes.value("type").trimmed();
     bool isMainModel = (attributes.value("mainModel").trimmed() == "true");
@@ -478,7 +478,7 @@
 
             file.waitForData();
 
-            int rate = sampleRate;
+            sv_samplerate_t rate = sampleRate;
 
             if (Preferences::getInstance()->getFixedSampleRate() != 0) {
                 rate = Preferences::getInstance()->getFixedSampleRate();