# HG changeset patch # User Chris Cannam # Date 1228411026 0 # Node ID bd7c46636bd08644d23c9e41ee2563d50ff9b290 # Parent ca208281238b52582105a6fb7ba068322824a328 * minor stuff diff -r ca208281238b -r bd7c46636bd0 data/fft/FFTDataServer.cpp --- 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; } diff -r ca208281238b -r bd7c46636bd0 data/fileio/FileSource.cpp --- 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 #include diff -r ca208281238b -r bd7c46636bd0 data/fileio/OggVorbisFileReader.cpp --- 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 #include -#include #include #include