# HG changeset patch # User Chris Cannam # Date 1161111244 0 # Node ID 900ac6667eabf45b82e31a75ee9cde18e449683b # Parent 86766fef54672f12b2fc0ad28bdcdfa0ad274ccb ... diff -r 86766fef5467 -r 900ac6667eab base/StorageAdviser.cpp --- a/base/StorageAdviser.cpp Tue Oct 17 13:49:31 2006 +0000 +++ b/base/StorageAdviser.cpp Tue Oct 17 18:54:04 2006 +0000 @@ -38,6 +38,11 @@ std::cerr << "Disc space: " << discFree << ", memory free: " << memoryFree << ", memory total: " << memoryTotal << std::endl; + //!!! We have a potentially serious problem here if multiple + //recommendations are made in advance of any of the resulting + //allocations, as the allocations that have been recommended for + //won't be taken into account in subsequent recommendations. + enum StorageStatus { Unknown, Insufficient, diff -r 86766fef5467 -r 900ac6667eab data/fileio/CodedAudioFileReader.cpp --- a/data/fileio/CodedAudioFileReader.cpp Tue Oct 17 13:49:31 2006 +0000 +++ b/data/fileio/CodedAudioFileReader.cpp Tue Oct 17 18:54:04 2006 +0000 @@ -18,6 +18,7 @@ #include "WavFileReader.h" #include "base/TempDirectory.h" #include "base/Exceptions.h" +#include "base/Profiler.h" #include #include @@ -116,6 +117,8 @@ void CodedAudioFileReader::finishDecodeCache() { + Profiler profiler("CodedAudioFileReader::finishDecodeCache", true); + if (!m_initialised) { std::cerr << "WARNING: CodedAudioFileReader::finishDecodeCache: Cache was never initialised!" << std::endl; return;