Mercurial > hg > svcore

changeset 502:bd7c46636bd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* minor stuff
author Chris Cannam
date Thu, 04 Dec 2008 17:17:06 +0000
parents ca208281238b
children 3176aade1a03
files data/fft/FFTDataServer.cpp data/fileio/FileSource.cpp data/fileio/OggVorbisFileReader.cpp
diffstat 3 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/data/fft/FFTDataServer.cpp	Thu Dec 04 17:15:15 2008 +0000
+++ b/data/fft/FFTDataServer.cpp	Thu Dec 04 17:17:06 2008 +0000
@@ -916,14 +916,9 @@
         fillColumn(x, true);
     }
 
-    float mean = 0.f;
     for (size_t i = 0; i < count; ++i) {
         values[i] = cache->getMagnitudeAt(col, i * step + minbin);
-        mean += values[i];
     }
-    if (count > 0) mean /= count;
-
-//    std::cerr << "FFTDataServer::getMagnitudeAt: returning " << count << " values of mean " << mean << std::endl;
     return true;
 }
 
--- a/data/fileio/FileSource.cpp	Thu Dec 04 17:15:15 2008 +0000
+++ b/data/fileio/FileSource.cpp	Thu Dec 04 17:17:06 2008 +0000
@@ -18,6 +18,7 @@
 #include "base/TempDirectory.h"
 #include "base/Exceptions.h"
 #include "base/ProgressReporter.h"
+#include "system/System.h"
 
 #include <QHttp>
 #include <QFtp>
--- a/data/fileio/OggVorbisFileReader.cpp	Thu Dec 04 17:15:15 2008 +0000
+++ b/data/fileio/OggVorbisFileReader.cpp	Thu Dec 04 17:17:06 2008 +0000
@@ -24,7 +24,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/mman.h>
 #include <fcntl.h>
 #include <cmath>