diff data/model/FFTModel.cpp @ 1159:444d133b5ab7 3.0-integration

Merge from branch "tony-2.0-integration"
author Chris Cannam
date Thu, 04 Feb 2016 11:13:39 +0000
parents 546d4e417346 e94719f941ba
children 12a8daa89970
line wrap: on
line diff
--- a/data/model/FFTModel.cpp	Fri Jan 22 18:12:06 2016 +0000
+++ b/data/model/FFTModel.cpp	Thu Feb 04 11:13:39 2016 +0000
@@ -149,7 +149,7 @@
     return true;
 }
 
-bool
+float
 FFTModel::getNormalizedMagnitudesAt(int x, float *values, int minbin, int count) const
 {
     if (!getMagnitudesAt(x, values, minbin, count)) return false;
@@ -163,7 +163,7 @@
             values[i] /= max;
         }
     }
-    return true;
+    return max;
 }
 
 bool