Mercurial > hg > svcore
changeset 690:1424aa29ae95
Seems to be a bad idea to use plain DEBUG symbol on OS/X (system wants it)
line wrap: on
line diff
--- a/base/Debug.h Tue Jun 14 14:47:59 2011 +0100 +++ b/base/Debug.h Tue Jun 14 15:26:52 2011 +0100 @@ -32,7 +32,7 @@ extern QDebug &getSVDebug(); -#define DEBUG getSVDebug() +#define SVDEBUG getSVDebug() template <typename T> inline QDebug &operator<<(QDebug &d, const T &t) { @@ -57,7 +57,7 @@ inline NoDebug &operator<<(QTextStreamFunction) { return *this; } }; -#define DEBUG NoDebug() +#define SVDEBUG NoDebug() #endif /* !NDEBUG */
--- a/base/LogRange.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/LogRange.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -26,7 +26,7 @@ if (min > max) std::swap(min, max); if (max == min) max = min + 1; -// DEBUG << "LogRange::mapRange: min = " << min << ", max = " << max << endl; +// SVDEBUG << "LogRange::mapRange: min = " << min << ", max = " << max << endl; if (min >= 0.f) { @@ -35,7 +35,7 @@ if (min == 0.f) min = std::min(logthresh, max); else min = log10f(min); -// DEBUG << "LogRange::mapRange: positive: min = " << min << ", max = " << max << endl; +// SVDEBUG << "LogRange::mapRange: positive: min = " << min << ", max = " << max << endl; } else if (max <= 0.f) { @@ -46,7 +46,7 @@ std::swap(min, max); -// DEBUG << "LogRange::mapRange: negative: min = " << min << ", max = " << max << endl; +// SVDEBUG << "LogRange::mapRange: negative: min = " << min << ", max = " << max << endl; } else { @@ -55,7 +55,7 @@ max = log10f(std::max(max, -min)); min = std::min(logthresh, max); -// DEBUG << "LogRange::mapRange: spanning: min = " << min << ", max = " << max << endl; +// SVDEBUG << "LogRange::mapRange: spanning: min = " << min << ", max = " << max << endl; } if (min == max) min = max - 1; @@ -104,7 +104,7 @@ float sd0 = sd(values, 0, mi); float sd1 = sd(values, mi, values.size() - mi); - DEBUG << "LogRange::useLogScale: sd0 = " + SVDEBUG << "LogRange::useLogScale: sd0 = " << sd0 << ", sd1 = " << sd1 << endl; if (sd0 == 0 || sd1 == 0) return false;
--- a/base/PlayParameterRepository.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/PlayParameterRepository.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -124,7 +124,7 @@ PlayParameterRepository::playPluginConfigurationChanged(QString config) { PlayParameters *params = dynamic_cast<PlayParameters *>(sender()); -// DEBUG << "PlayParameterRepository::playPluginConfigurationChanged" << endl; +// SVDEBUG << "PlayParameterRepository::playPluginConfigurationChanged" << endl; for (PlayableParameterMap::iterator i = m_playParameters.begin(); i != m_playParameters.end(); ++i) { if (i->second == params) {
--- a/base/PropertyContainer.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/PropertyContainer.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -192,7 +192,7 @@ break; case InvalidProperty: - DEBUG << "PropertyContainer::convertPropertyStrings: Invalid property name \"" << name << "\"" << endl; + SVDEBUG << "PropertyContainer::convertPropertyStrings: Invalid property name \"" << name << "\"" << endl; return false; } @@ -207,7 +207,7 @@ std::cerr << "PropertyContainer::convertPropertyStrings: Unable to parse value string \"" << valueString << "\"" << std::endl; return false; } else if (i < min || i > max) { - DEBUG << "PropertyContainer::convertPropertyStrings: Property value \"" << i << "\" outside valid range " << min << " to " << max << endl; + SVDEBUG << "PropertyContainer::convertPropertyStrings: Property value \"" << i << "\" outside valid range " << min << " to " << max << endl; return false; }
--- a/base/RangeMapper.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/RangeMapper.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -43,7 +43,7 @@ * (m_maxpos - m_minpos)); if (position < m_minpos) position = m_minpos; if (position > m_maxpos) position = m_maxpos; -// DEBUG << "LinearRangeMapper::getPositionForValue: " << value << " -> " +// SVDEBUG << "LinearRangeMapper::getPositionForValue: " << value << " -> " // << position << " (minpos " << m_minpos << ", maxpos " << m_maxpos << ", minval " << m_minval << ", maxval " << m_maxval << ")" << endl; if (m_inverted) return m_maxpos - position; else return position; @@ -58,7 +58,7 @@ * (m_maxval - m_minval)); if (value < m_minval) value = m_minval; if (value > m_maxval) value = m_maxval; -// DEBUG << "LinearRangeMapper::getValueForPosition: " << position << " -> " +// SVDEBUG << "LinearRangeMapper::getValueForPosition: " << position << " -> " // << value << " (minpos " << m_minpos << ", maxpos " << m_maxpos << ", minval " << m_minval << ", maxval " << m_maxval << ")" << endl; return value; } @@ -109,7 +109,7 @@ int position = (log10(value) - m_minlog) * m_ratio + m_minpos; if (position < m_minpos) position = m_minpos; if (position > m_maxpos) position = m_maxpos; -// DEBUG << "LogRangeMapper::getPositionForValue: " << value << " -> " +// SVDEBUG << "LogRangeMapper::getPositionForValue: " << value << " -> " // << position << " (minpos " << m_minpos << ", maxpos " << m_maxpos << ", ratio " << m_ratio << ", minlog " << m_minlog << ")" << endl; if (m_inverted) return m_maxpos - position; else return position; @@ -120,7 +120,7 @@ { if (m_inverted) position = m_maxpos - position; float value = powf(10, (position - m_minpos) / m_ratio + m_minlog); -// DEBUG << "LogRangeMapper::getValueForPosition: " << position << " -> " +// SVDEBUG << "LogRangeMapper::getValueForPosition: " << position << " -> " // << value << " (minpos " << m_minpos << ", maxpos " << m_maxpos << ", ratio " << m_ratio << ", minlog " << m_minlog << ")" << endl; return value; }
--- a/base/RealTime.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/RealTime.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -242,7 +242,7 @@ int nsec = atoi(snsec.c_str()); if (negative) sec = -sec; -// DEBUG << "RealTime::fromString: string " << s << " -> " +// SVDEBUG << "RealTime::fromString: string " << s << " -> " // << sec << " sec, " << nsec << " nsec" << endl; return RealTime(sec, nsec);
--- a/base/ResourceFinder.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/ResourceFinder.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -152,7 +152,7 @@ QString prefix = *i; - DEBUG << "ResourceFinder::getResourcePath: Looking up file \"" << fileName << "\" for category \"" << resourceCat << "\" in prefix \"" << prefix << "\"" << endl; + SVDEBUG << "ResourceFinder::getResourcePath: Looking up file \"" << fileName << "\" for category \"" << resourceCat << "\" in prefix \"" << prefix << "\"" << endl; QString path = QString("%1%2/%3").arg(prefix).arg(resourceCat).arg(fileName); @@ -278,7 +278,7 @@ // This is the lowest-priority alternative path for this // resource, so we know that there must be no installed copy. // Install one to the user location. - DEBUG << "ResourceFinder::unbundleResource: File " << fileName << " is bundled, un-bundling it" << endl; + SVDEBUG << "ResourceFinder::unbundleResource: File " << fileName << " is bundled, un-bundling it" << endl; QString target = getResourceSavePath(resourceCat, fileName); QFile file(path); if (!file.copy(target)) {
--- a/base/StorageAdviser.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/StorageAdviser.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -36,7 +36,7 @@ int maximumSize) { #ifdef DEBUG_STORAGE_ADVISER - DEBUG << "StorageAdviser::recommend: Criteria " << criteria + SVDEBUG << "StorageAdviser::recommend: Criteria " << criteria << ", minimumSize " << minimumSize << ", maximumSize " << maximumSize << endl; #endif
--- a/base/TempDirectory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/TempDirectory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -44,7 +44,7 @@ TempDirectory::~TempDirectory() { - DEBUG << "TempDirectory::~TempDirectory" << endl; + SVDEBUG << "TempDirectory::~TempDirectory" << endl; cleanup(); }
--- a/base/XmlExportable.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/base/XmlExportable.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -25,7 +25,7 @@ XmlExportable::toXmlString(QString indent, QString extraAttributes) const { -// DEBUG << "XmlExportable::toXmlString" << endl; +// SVDEBUG << "XmlExportable::toXmlString" << endl; QString s;
--- a/data/fft/FFTDataServer.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fft/FFTDataServer.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -191,7 +191,7 @@ if (server->getFillCompletion() < 50) distance += 100; #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::getFuzzyInstance: Distance for server " << server << " is " << distance << ", best is " << bestdist << endl; + SVDEBUG << "FFTDataServer::getFuzzyInstance: Distance for server " << server << " is " << distance << ", best is " << bestdist << endl; #endif if (bestdist == -1 || distance < bestdist) { @@ -204,7 +204,7 @@ if (bestdist >= 0) { FFTDataServer *server = best->second.first; #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::getFuzzyInstance: We like server " << server << " (with distance " << bestdist << ")" << endl; + SVDEBUG << "FFTDataServer::getFuzzyInstance: We like server " << server << " (with distance " << bestdist << ")" << endl; #endif claimInstance(server, false); return server; @@ -228,7 +228,7 @@ FFTDataServer::findServer(QString n) { #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::findServer(\"" << n << "\")" << endl; + SVDEBUG << "FFTDataServer::findServer(\"" << n << "\")" << endl; #endif if (m_servers.find(n) != m_servers.end()) { @@ -236,7 +236,7 @@ FFTDataServer *server = m_servers[n].first; #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::findServer(\"" << n << "\"): found " << server << endl; + SVDEBUG << "FFTDataServer::findServer(\"" << n << "\"): found " << server << endl; #endif claimInstance(server, false); @@ -245,7 +245,7 @@ } #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::findServer(\"" << n << "\"): not found" << endl; + SVDEBUG << "FFTDataServer::findServer(\"" << n << "\"): not found" << endl; #endif return 0; @@ -264,7 +264,7 @@ "FFTDataServer::claimInstance::m_serverMapMutex"); #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::claimInstance(" << server << ")" << endl; + SVDEBUG << "FFTDataServer::claimInstance(" << server << ")" << endl; #endif for (ServerMap::iterator i = m_servers.begin(); i != m_servers.end(); ++i) { @@ -275,7 +275,7 @@ if (*j == server) { #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::claimInstance: found in released server list, removing from it" << endl; + SVDEBUG << "FFTDataServer::claimInstance: found in released server list, removing from it" << endl; #endif m_releasedServers.erase(j); break; @@ -285,7 +285,7 @@ ++i->second.second; #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::claimInstance: new refcount is " << i->second.second << endl; + SVDEBUG << "FFTDataServer::claimInstance: new refcount is " << i->second.second << endl; #endif return; @@ -309,7 +309,7 @@ "FFTDataServer::releaseInstance::m_serverMapMutex"); #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::releaseInstance(" << server << ")" << endl; + SVDEBUG << "FFTDataServer::releaseInstance(" << server << ")" << endl; #endif // -- if ref count > 0, decrement and return @@ -332,7 +332,7 @@ /*!!! if (server->m_lastUsedCache == -1) { // never used #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::releaseInstance: instance " + SVDEBUG << "FFTDataServer::releaseInstance: instance " << server << " has never been used, erasing" << endl; #endif @@ -341,7 +341,7 @@ } else { */ #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::releaseInstance: instance " + SVDEBUG << "FFTDataServer::releaseInstance: instance " << server << " no longer in use, marking for possible collection" << endl; #endif @@ -361,7 +361,7 @@ //!!! } } else { #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::releaseInstance: instance " + SVDEBUG << "FFTDataServer::releaseInstance: instance " << server << " now has refcount " << i->second.second << endl; #endif @@ -378,7 +378,7 @@ FFTDataServer::purgeLimbo(int maxSize) { #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::purgeLimbo(" << maxSize << "): " + SVDEBUG << "FFTDataServer::purgeLimbo(" << maxSize << "): " << m_releasedServers.size() << " candidates" << endl; #endif @@ -389,7 +389,7 @@ bool found = false; #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::purgeLimbo: considering candidate " + SVDEBUG << "FFTDataServer::purgeLimbo: considering candidate " << server << endl; #endif @@ -405,7 +405,7 @@ break; } #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::purgeLimbo: looks OK, erasing it" + SVDEBUG << "FFTDataServer::purgeLimbo: looks OK, erasing it" << endl; #endif @@ -426,7 +426,7 @@ } #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::purgeLimbo(" << maxSize << "): " + SVDEBUG << "FFTDataServer::purgeLimbo(" << maxSize << "): " << m_releasedServers.size() << " remain" << endl; #endif @@ -439,7 +439,7 @@ "FFTDataServer::modelAboutToBeDeleted::m_serverMapMutex"); #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::modelAboutToBeDeleted(" << model << ")" + SVDEBUG << "FFTDataServer::modelAboutToBeDeleted(" << model << ")" << endl; #endif @@ -450,7 +450,7 @@ if (server->getModel() == model) { #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::modelAboutToBeDeleted: server is " + SVDEBUG << "FFTDataServer::modelAboutToBeDeleted: server is " << server << endl; #endif @@ -463,14 +463,14 @@ j != m_releasedServers.end(); ++j) { if (*j == server) { #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::modelAboutToBeDeleted: erasing from released servers" << endl; + SVDEBUG << "FFTDataServer::modelAboutToBeDeleted: erasing from released servers" << endl; #endif m_releasedServers.erase(j); break; } } #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::modelAboutToBeDeleted: erasing server" << endl; + SVDEBUG << "FFTDataServer::modelAboutToBeDeleted: erasing server" << endl; #endif m_servers.erase(i); delete server; @@ -841,7 +841,7 @@ // preconditions: m_caches[c] exists and contains a file writer; // m_cacheVectorLock is not locked by this thread #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::makeCacheReader(" << c << ")" << endl; + SVDEBUG << "FFTDataServer::makeCacheReader(" << c << ")" << endl; #endif QThread *me = QThread::currentThread(); @@ -875,7 +875,7 @@ cb = m_caches.at(deleteCandidate); if (cb && cb->fileCacheReader.find(me) != cb->fileCacheReader.end()) { #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::makeCacheReader: Deleting probably unpopular reader " << deleteCandidate << " for this thread (as I create reader " << c << ")" << endl; + SVDEBUG << "FFTDataServer::makeCacheReader: Deleting probably unpopular reader " << deleteCandidate << " for this thread (as I create reader " << c << ")" << endl; #endif delete cb->fileCacheReader[me]; cb->fileCacheReader.erase(me); @@ -901,7 +901,7 @@ if (!cache->haveSetColumnAt(col)) { Profiler profiler("FFTDataServer::getMagnitudeAt: filling"); #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::getMagnitudeAt: calling fillColumn(" + SVDEBUG << "FFTDataServer::getMagnitudeAt: calling fillColumn(" << x << ")" << endl; #endif fillColumn(x); @@ -1130,7 +1130,7 @@ if (!cache->haveSetColumnAt(col)) { Profiler profiler("FFTDataServer::getValuesAt: filling"); #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::getValuesAt(" << x << ", " << y << "): filling" << endl; + SVDEBUG << "FFTDataServer::getValuesAt(" << x << ", " << y << "): filling" << endl; #endif fillColumn(x); } @@ -1189,7 +1189,7 @@ /*!!! if (m_lastUsedCache == -1) { if (m_suspended) { - DEBUG << "FFTDataServer::isColumnReady(" << x << "): no cache, calling resume" << endl; + SVDEBUG << "FFTDataServer::isColumnReady(" << x << "): no cache, calling resume" << endl; resume(); } m_fillThread->start(); @@ -1258,7 +1258,7 @@ endFrame -= winsize / 2; #ifdef DEBUG_FFT_SERVER_FILL - DEBUG << "FFTDataServer::fillColumn: requesting frames " + SVDEBUG << "FFTDataServer::fillColumn: requesting frames " << startFrame + pfx << " -> " << endFrame << " ( = " << endFrame - (startFrame + pfx) << ") at index " << off + pfx << " in buffer of size " << m_fftSize @@ -1370,7 +1370,7 @@ } if (m_suspended) { -// DEBUG << "FFTDataServer::fillColumn(" << x << "): calling resume" << endl; +// SVDEBUG << "FFTDataServer::fillColumn(" << x << "): calling resume" << endl; // resume(); } } @@ -1446,7 +1446,7 @@ FFTDataServer::FillThread::run() { #ifdef DEBUG_FFT_SERVER_FILL - DEBUG << "FFTDataServer::FillThread::run()" << endl; + SVDEBUG << "FFTDataServer::FillThread::run()" << endl; #endif m_extent = 0; @@ -1454,7 +1454,7 @@ while (!m_server.m_model->isReady() && !m_server.m_exiting) { #ifdef DEBUG_FFT_SERVER_FILL - DEBUG << "FFTDataServer::FillThread::run(): waiting for model " << m_server.m_model << " to be ready" << endl; + SVDEBUG << "FFTDataServer::FillThread::run(): waiting for model " << m_server.m_model << " to be ready" << endl; #endif sleep(1); } @@ -1476,7 +1476,7 @@ try { m_server.fillColumn(int((f - start) / m_server.m_windowIncrement)); } catch (std::exception &e) { - DEBUG << "FFTDataServer::FillThread::run: exception: " << e.what() << endl; + SVDEBUG << "FFTDataServer::FillThread::run: exception: " << e.what() << endl; m_error = e.what(); m_server.fillComplete(); m_completion = 100; @@ -1525,7 +1525,7 @@ try { m_server.fillColumn(int((f - start) / m_server.m_windowIncrement)); } catch (std::exception &e) { - DEBUG << "FFTDataServer::FillThread::run: exception: " << e.what() << endl; + SVDEBUG << "FFTDataServer::FillThread::run: exception: " << e.what() << endl; m_error = e.what(); m_server.fillComplete(); m_completion = 100; @@ -1567,7 +1567,7 @@ m_extent = end; #ifdef DEBUG_FFT_SERVER - DEBUG << "FFTDataServer::FillThread::run exiting" << endl; + SVDEBUG << "FFTDataServer::FillThread::run exiting" << endl; #endif }
--- a/data/fft/FFTFileCacheReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fft/FFTFileCacheReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -157,7 +157,7 @@ void FFTFileCacheReader::getValuesAt(size_t x, size_t y, float &real, float &imag) const { -// DEBUG << "FFTFileCacheReader::getValuesAt(" << x << "," << y << ")" << endl; +// SVDEBUG << "FFTFileCacheReader::getValuesAt(" << x << "," << y << ")" << endl; switch (m_storageType) { @@ -216,7 +216,7 @@ { if (m_readbuf && m_readbufGood && (m_readbufCol == x || (m_readbufWidth > 1 && m_readbufCol+1 == x))) { -// DEBUG << "FFTFileCacheReader::haveSetColumnAt: short-circuiting; we know about this one" << endl; +// SVDEBUG << "FFTFileCacheReader::haveSetColumnAt: short-circuiting; we know about this one" << endl; return true; } return m_mfc->haveSetColumnAt(x); @@ -236,7 +236,7 @@ { Profiler profiler("FFTFileCacheReader::populateReadBuf", false); -// DEBUG << "FFTFileCacheReader::populateReadBuf(" << x << ")" << endl; +// SVDEBUG << "FFTFileCacheReader::populateReadBuf(" << x << ")" << endl; if (!m_readbuf) { m_readbuf = new char[m_mfc->getHeight() * 2 * m_mfc->getCellSize()];
--- a/data/fft/FFTFileCacheWriter.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fft/FFTFileCacheWriter.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -188,7 +188,7 @@ FFTFileCacheWriter::allColumnsWritten() { #ifdef DEBUG_FFT_FILE_CACHE_WRITER - DEBUG << "FFTFileCacheWriter::allColumnsWritten" << endl; + SVDEBUG << "FFTFileCacheWriter::allColumnsWritten" << endl; #endif m_mfc->close(); }
--- a/data/fileio/AudioFileReaderFactory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/AudioFileReaderFactory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -73,7 +73,7 @@ { QString err; -// DEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\"): Requested rate: " << targetRate << endl; +// SVDEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\"): Requested rate: " << targetRate << endl; if (!source.isOK()) { std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString() << std::endl; @@ -81,7 +81,7 @@ } if (!source.isAvailable()) { - DEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Source not found" << endl; + SVDEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Source not found" << endl; return 0; } @@ -98,7 +98,7 @@ reader->isOK() && reader->getSampleRate() != targetRate) { - DEBUG << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << endl; + SVDEBUG << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << endl; delete reader; reader = new ResamplingWavFileReader @@ -189,7 +189,7 @@ reader->isOK() && reader->getSampleRate() != targetRate) { - DEBUG << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << endl; + SVDEBUG << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << endl; delete reader; reader = new ResamplingWavFileReader
--- a/data/fileio/BZipFileDevice.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/BZipFileDevice.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -30,7 +30,7 @@ BZipFileDevice::~BZipFileDevice() { -// DEBUG << "BZipFileDevice::~BZipFileDevice(" << m_fileName << ")" << endl; +// SVDEBUG << "BZipFileDevice::~BZipFileDevice(" << m_fileName << ")" << endl; if (m_bzFile) close(); } @@ -178,7 +178,7 @@ int bzError = BZ_OK; int read = BZ2_bzRead(&bzError, m_bzFile, data, maxSize); -// DEBUG << "BZipFileDevice::readData: requested " << maxSize << ", read " << read << endl; +// SVDEBUG << "BZipFileDevice::readData: requested " << maxSize << ", read " << read << endl; if (bzError != BZ_OK) { if (bzError != BZ_STREAM_END) { @@ -187,7 +187,7 @@ m_ok = false; return -1; } else { -// DEBUG << "BZipFileDevice::readData: reached end of file" << endl; +// SVDEBUG << "BZipFileDevice::readData: reached end of file" << endl; m_atEnd = true; } } @@ -201,7 +201,7 @@ int bzError = BZ_OK; BZ2_bzWrite(&bzError, m_bzFile, (void *)data, maxSize); -// DEBUG << "BZipFileDevice::writeData: " << maxSize << " to write" << endl; +// SVDEBUG << "BZipFileDevice::writeData: " << maxSize << " to write" << endl; if (bzError != BZ_OK) { std::cerr << "BZipFileDevice::writeData: error condition" << std::endl; @@ -210,7 +210,7 @@ return -1; } -// DEBUG << "BZipFileDevice::writeData: wrote " << maxSize << endl; +// SVDEBUG << "BZipFileDevice::writeData: wrote " << maxSize << endl; return maxSize; }
--- a/data/fileio/CSVFileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/CSVFileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -59,10 +59,10 @@ CSVFileReader::~CSVFileReader() { - DEBUG << "CSVFileReader::~CSVFileReader: file is " << m_file << endl; + SVDEBUG << "CSVFileReader::~CSVFileReader: file is " << m_file << endl; if (m_file) { - DEBUG << "CSVFileReader::CSVFileReader: Closing file" << endl; + SVDEBUG << "CSVFileReader::CSVFileReader: Closing file" << endl; m_file->close(); } delete m_file; @@ -345,7 +345,7 @@ } } -// DEBUG << "Setting bin values for count " << lineno << ", frame " +// SVDEBUG << "Setting bin values for count " << lineno << ", frame " // << frameNo << ", time " << RealTime::frame2RealTime(frameNo, sampleRate) << endl; model3->setColumn(lineno, values);
--- a/data/fileio/CachedFile.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/CachedFile.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -78,7 +78,7 @@ { Profiler p("CachedFile::CachedFile[1]"); - DEBUG << "CachedFile::CachedFile: origin is \"" + SVDEBUG << "CachedFile::CachedFile: origin is \"" << origin << "\"" << endl; check(); } @@ -93,7 +93,7 @@ { Profiler p("CachedFile::CachedFile[2]"); - DEBUG << "CachedFile::CachedFile: url is \"" + SVDEBUG << "CachedFile::CachedFile: url is \"" << url.toString() << "\"" << endl; check(); } @@ -132,20 +132,20 @@ m_localFilename = getLocalFilenameFor(m_origin); if (!QFileInfo(m_localFilename).exists()) { - DEBUG << "CachedFile::check: Local file does not exist, making a note that it hasn't been retrieved" << endl; + SVDEBUG << "CachedFile::check: Local file does not exist, making a note that it hasn't been retrieved" << endl; updateLastRetrieval(false); // empirically! } QDateTime lastRetrieval = getLastRetrieval(); if (lastRetrieval.isValid()) { - DEBUG << "CachedFile::check: Valid last retrieval at " + SVDEBUG << "CachedFile::check: Valid last retrieval at " << lastRetrieval.toString() << endl; // this will not be the case if the file is missing, after // updateLastRetrieval(false) was called above m_ok = true; if (lastRetrieval.addDays(2) < QDateTime::currentDateTime()) { //!!! - DEBUG << "CachedFile::check: Out of date; trying to retrieve again" << endl; + SVDEBUG << "CachedFile::check: Out of date; trying to retrieve again" << endl; // doesn't matter if retrieval fails -- we just don't // update the last retrieval time @@ -154,17 +154,17 @@ // retrieval every single time if it isn't working if (retrieve()) { - DEBUG << "CachedFile::check: Retrieval succeeded" << endl; + SVDEBUG << "CachedFile::check: Retrieval succeeded" << endl; updateLastRetrieval(true); } else { std::cerr << "CachedFile::check: Retrieval failed, will try again later (using existing file for now)" << std::endl; } } } else { - DEBUG << "CachedFile::check: No valid last retrieval" << endl; + SVDEBUG << "CachedFile::check: No valid last retrieval" << endl; // there is no acceptable file if (retrieve()) { - DEBUG << "CachedFile::check: Retrieval succeeded" << endl; + SVDEBUG << "CachedFile::check: Retrieval succeeded" << endl; m_ok = true; updateLastRetrieval(true); } else { @@ -191,21 +191,21 @@ FileSource fs(m_origin, m_reporter, m_preferredContentType); if (!fs.isOK() || !fs.isAvailable()) { - DEBUG << "CachedFile::retrieve: ERROR: FileSource reported unavailable or failure" << endl; + SVDEBUG << "CachedFile::retrieve: ERROR: FileSource reported unavailable or failure" << endl; return false; } fs.waitForData(); if (!fs.isOK()) { - DEBUG << "CachedFile::retrieve: ERROR: FileSource reported failure during receive" << endl; + SVDEBUG << "CachedFile::retrieve: ERROR: FileSource reported failure during receive" << endl; return false; } QString tempName = fs.getLocalFilename(); QFile tempFile(tempName); if (!tempFile.exists()) { - DEBUG << "CachedFile::retrieve: ERROR: FileSource reported success, but local temporary file \"" << tempName << "\" does not exist" << endl; + SVDEBUG << "CachedFile::retrieve: ERROR: FileSource reported success, but local temporary file \"" << tempName << "\" does not exist" << endl; return false; } @@ -226,7 +226,7 @@ return false; } - DEBUG << "CachedFile::retrieve: Successfully copied newly retrieved file \"" << tempName << "\" to its home at \"" << m_localFilename << "\"" << endl; + SVDEBUG << "CachedFile::retrieve: Successfully copied newly retrieved file \"" << tempName << "\" to its home at \"" << m_localFilename << "\"" << endl; return true; }
--- a/data/fileio/CodedAudioFileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/CodedAudioFileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -40,7 +40,7 @@ m_resampler(0), m_resampleBuffer(0) { -// DEBUG << "CodedAudioFileReader::CodedAudioFileReader: rate " << targetRate << endl; +// SVDEBUG << "CodedAudioFileReader::CodedAudioFileReader: rate " << targetRate << endl; m_frameCount = 0; m_sampleRate = targetRate; @@ -54,7 +54,7 @@ if (m_cacheFileWritePtr) sf_close(m_cacheFileWritePtr); -// DEBUG << "CodedAudioFileReader::~CodedAudioFileReader: deleting cache file reader" << endl; +// SVDEBUG << "CodedAudioFileReader::~CodedAudioFileReader: deleting cache file reader" << endl; delete m_cacheFileReader; delete[] m_cacheWriteBuffer; @@ -72,7 +72,7 @@ void CodedAudioFileReader::startSerialised(QString id) { -// DEBUG << "CodedAudioFileReader::startSerialised(" << id << ")" << endl; +// SVDEBUG << "CodedAudioFileReader::startSerialised(" << id << ")" << endl; delete m_serialiser; m_serialiser = new Serialiser(id); @@ -92,15 +92,15 @@ { QMutexLocker locker(&m_cacheMutex); -// DEBUG << "CodedAudioFileReader::initialiseDecodeCache: file rate = " << m_fileRate << endl; +// SVDEBUG << "CodedAudioFileReader::initialiseDecodeCache: file rate = " << m_fileRate << endl; if (m_fileRate == 0) { - DEBUG << "CodedAudioFileReader::initialiseDecodeCache: ERROR: File sample rate unknown (bug in subclass implementation?)" << endl; + SVDEBUG << "CodedAudioFileReader::initialiseDecodeCache: ERROR: File sample rate unknown (bug in subclass implementation?)" << endl; m_fileRate = 48000; // got to have something } if (m_sampleRate == 0) { m_sampleRate = m_fileRate; - DEBUG << "CodedAudioFileReader::initialiseDecodeCache: rate (from file) = " << m_fileRate << endl; + SVDEBUG << "CodedAudioFileReader::initialiseDecodeCache: rate (from file) = " << m_fileRate << endl; } if (m_fileRate != m_sampleRate) { std::cerr << "CodedAudioFileReader: resampling " << m_fileRate << " -> " << m_sampleRate << std::endl; @@ -354,7 +354,7 @@ // locking) if (!m_initialised) { - DEBUG << "CodedAudioFileReader::getInterleavedFrames: not initialised" << endl; + SVDEBUG << "CodedAudioFileReader::getInterleavedFrames: not initialised" << endl; return; }
--- a/data/fileio/FileReadThread.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/FileReadThread.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -47,7 +47,7 @@ notifyCancelled(); #ifdef DEBUG_FILE_READ_THREAD - DEBUG << "FileReadThread::run() exiting" << endl; + SVDEBUG << "FileReadThread::run() exiting" << endl; #endif } @@ -55,7 +55,7 @@ FileReadThread::finish() { #ifdef DEBUG_FILE_READ_THREAD - DEBUG << "FileReadThread::finish()" << endl; + SVDEBUG << "FileReadThread::finish()" << endl; #endif { @@ -73,7 +73,7 @@ m_condition.wakeAll(); #ifdef DEBUG_FILE_READ_THREAD - DEBUG << "FileReadThread::finish() exiting" << endl; + SVDEBUG << "FileReadThread::finish() exiting" << endl; #endif } @@ -113,7 +113,7 @@ } #ifdef DEBUG_FILE_READ_THREAD - DEBUG << "FileReadThread::cancel(" << token << ") waking condition" << endl; + SVDEBUG << "FileReadThread::cancel(" << token << ") waking condition" << endl; #endif m_condition.wakeAll(); @@ -216,7 +216,7 @@ m_mutex.unlock(); #ifdef DEBUG_FILE_READ_THREAD - DEBUG << "FileReadThread::process: reading " << request.start << ", " << request.size << " on " << request.fd << endl; + SVDEBUG << "FileReadThread::process: reading " << request.start << ", " << request.size << " on " << request.fd << endl; #endif bool successful = false; @@ -289,14 +289,14 @@ m_queue.erase(token); m_readyRequests[token] = request; #ifdef DEBUG_FILE_READ_THREAD - DEBUG << "FileReadThread::process: done, marking as ready (success = " << m_readyRequests[token].successful << ")" << endl; + SVDEBUG << "FileReadThread::process: done, marking as ready (success = " << m_readyRequests[token].successful << ")" << endl; #endif } else { #ifdef DEBUG_FILE_READ_THREAD if (m_exiting) { - DEBUG << "FileReadThread::process: exiting" << endl; + SVDEBUG << "FileReadThread::process: exiting" << endl; } else { - DEBUG << "FileReadThread::process: request disappeared" << endl; + SVDEBUG << "FileReadThread::process: request disappeared" << endl; } #endif } @@ -312,7 +312,7 @@ int token = *m_newlyCancelled.begin(); #ifdef DEBUG_FILE_READ_THREAD - DEBUG << "FileReadThread::notifyCancelled: token " << token << endl; + SVDEBUG << "FileReadThread::notifyCancelled: token " << token << endl; #endif m_newlyCancelled.erase(token);
--- a/data/fileio/FileSource.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/FileSource.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -88,12 +88,12 @@ } #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::FileSource(" << fileOrUrl << "): url <" << m_url.toString() << ">" << endl; + SVDEBUG << "FileSource::FileSource(" << fileOrUrl << "): url <" << m_url.toString() << ">" << endl; incCount(m_url.toString()); #endif if (!canHandleScheme(m_url)) { - DEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; + SVDEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; m_errorString = tr("Unsupported scheme in URL"); return; } @@ -148,7 +148,7 @@ } #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::FileSource(string) exiting" << endl; + SVDEBUG << "FileSource::FileSource(string) exiting" << endl; #endif } @@ -166,12 +166,12 @@ m_refCounted(false) { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::FileSource(" << url.toString() << ") [as url]" << endl; + SVDEBUG << "FileSource::FileSource(" << url.toString() << ") [as url]" << endl; incCount(m_url.toString()); #endif if (!canHandleScheme(m_url)) { - DEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; + SVDEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; m_errorString = tr("Unsupported scheme in URL"); return; } @@ -179,7 +179,7 @@ init(); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::FileSource(url) exiting" << endl; + SVDEBUG << "FileSource::FileSource(url) exiting" << endl; #endif } @@ -198,12 +198,12 @@ m_refCounted(false) { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]" << endl; + SVDEBUG << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]" << endl; incCount(m_url.toString()); #endif if (!canHandleScheme(m_url)) { - DEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; + SVDEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; m_errorString = tr("Unsupported scheme in URL"); return; } @@ -213,7 +213,7 @@ } else { QMutexLocker locker(&m_mapMutex); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::FileSource(copy ctor): ref count is " + SVDEBUG << "FileSource::FileSource(copy ctor): ref count is " << m_refCountMap[m_url] << endl; #endif if (m_refCountMap[m_url] > 0) { @@ -232,11 +232,11 @@ m_done = true; #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]: note: local filename is \"" << m_localFilename << "\"" << endl; + SVDEBUG << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]: note: local filename is \"" << m_localFilename << "\"" << endl; #endif #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::FileSource(copy ctor) exiting" << endl; + SVDEBUG << "FileSource::FileSource(copy ctor) exiting" << endl; #endif } @@ -257,7 +257,7 @@ { if (!isRemote()) { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::init: Not a remote URL" << endl; + SVDEBUG << "FileSource::init: Not a remote URL" << endl; #endif bool literal = false; m_localFilename = m_url.toLocalFile(); @@ -269,7 +269,7 @@ m_localFilename = QFileInfo(m_localFilename).absoluteFilePath(); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::init: URL translates to local filename \"" + SVDEBUG << "FileSource::init: URL translates to local filename \"" << m_localFilename << "\" (with literal=" << literal << ")" << endl; #endif m_ok = true; @@ -280,7 +280,7 @@ m_lastStatus = 404; } else { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::init: Local file of this name does not exist, trying URL as a literal filename" << endl; + SVDEBUG << "FileSource::init: Local file of this name does not exist, trying URL as a literal filename" << endl; #endif // Again, QUrl may have been mistreating us -- // e.g. dropping a part that looks like query data @@ -298,7 +298,7 @@ if (createCacheFile()) { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::init: Already have this one" << endl; + SVDEBUG << "FileSource::init: Already have this one" << endl; #endif m_ok = true; if (!QFileInfo(m_localFilename).exists()) { @@ -317,7 +317,7 @@ QString scheme = m_url.scheme().toLower(); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::init: Don't have local copy of \"" + SVDEBUG << "FileSource::init: Don't have local copy of \"" << m_url.toString() << "\", retrieving" << endl; #endif @@ -343,7 +343,7 @@ cleanup(); m_refCountMap[m_url]++; #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::init: Another FileSource has got there first, abandoning our download and using theirs" << endl; + SVDEBUG << "FileSource::init: Another FileSource has got there first, abandoning our download and using theirs" << endl; #endif m_localFilename = m_remoteLocalMap[m_url]; m_refCounted = true; @@ -426,7 +426,7 @@ QString path = "/" + QString(m_url.toEncoded()).section('/', 3); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource: path is \"" + SVDEBUG << "FileSource: path is \"" << path << "\"" << endl; #endif @@ -528,7 +528,7 @@ if (!m_ok) available = false; else available = (m_lastStatus / 100 == 2); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::isAvailable: " << (available ? "yes" : "no") + SVDEBUG << "FileSource::isAvailable: " << (available ? "yes" : "no") << endl; #endif return available; @@ -547,7 +547,7 @@ FileSource::waitForData() { while (m_ok && !m_done) { -// DEBUG << "FileSource::waitForData: calling QApplication::processEvents" << endl; +// SVDEBUG << "FileSource::waitForData: calling QApplication::processEvents" << endl; QCoreApplication::processEvents(); usleep(10000); } @@ -627,13 +627,13 @@ FileSource::httpResponseHeaderReceived(const QHttpResponseHeader &resp) { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::httpResponseHeaderReceived" << endl; + SVDEBUG << "FileSource::httpResponseHeaderReceived" << endl; #endif if (resp.statusCode() / 100 == 3) { QString location = resp.value("Location"); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::responseHeaderReceived: redirect to \"" + SVDEBUG << "FileSource::responseHeaderReceived: redirect to \"" << location << "\" received" << endl; #endif if (location != "") { @@ -661,12 +661,12 @@ m_errorString = QString("%1 %2") .arg(resp.statusCode()).arg(resp.reasonPhrase()); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::responseHeaderReceived: " + SVDEBUG << "FileSource::responseHeaderReceived: " << m_errorString << endl; #endif } else { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::responseHeaderReceived: " + SVDEBUG << "FileSource::responseHeaderReceived: " << m_lastStatus << endl; #endif if (resp.hasContentType()) m_contentType = resp.contentType(); @@ -687,7 +687,7 @@ if (!error) { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::ftpCommandFinished: success for command " + SVDEBUG << "FileSource::ftpCommandFinished: success for command " << command << endl; #endif return; @@ -776,7 +776,7 @@ FileSource::deleteCacheFile() { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::deleteCacheFile(\"" << m_localFilename << "\")" << endl; + SVDEBUG << "FileSource::deleteCacheFile(\"" << m_localFilename << "\")" << endl; #endif cleanup(); @@ -817,7 +817,7 @@ #endif } else { #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::deleteCacheFile: Deleted cache file \"" << m_localFilename << "\"" << endl; + SVDEBUG << "FileSource::deleteCacheFile: Deleted cache file \"" << m_localFilename << "\"" << endl; #endif m_localFilename = ""; } @@ -834,7 +834,7 @@ QMutexLocker locker(&m_mapMutex); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::createCacheFile: refcount is " << m_refCountMap[m_url] << endl; + SVDEBUG << "FileSource::createCacheFile: refcount is " << m_refCountMap[m_url] << endl; #endif if (m_refCountMap[m_url] > 0) { @@ -881,7 +881,7 @@ QString filepath(dir.filePath(filename)); #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::createCacheFile: URL is \"" << m_url.toString() << "\", dir is \"" << dir.path() << "\", base \"" << base << "\", extension \"" << extension << "\", filebase \"" << filename << "\", filename \"" << filepath << "\"" << endl; + SVDEBUG << "FileSource::createCacheFile: URL is \"" << m_url.toString() << "\", dir is \"" << dir.path() << "\", base \"" << base << "\", extension \"" << extension << "\", filebase \"" << filename << "\", filename \"" << filepath << "\"" << endl; #endif QMutexLocker fcLocker(&m_fileCreationMutex); @@ -918,7 +918,7 @@ } #ifdef DEBUG_FILE_SOURCE - DEBUG << "FileSource::createCacheFile: url " + SVDEBUG << "FileSource::createCacheFile: url " << m_url.toString() << " -> local filename " << filepath << endl; #endif
--- a/data/fileio/MIDIFileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/MIDIFileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -52,7 +52,7 @@ using namespace MIDIConstants; -//#define MIDI_DEBUG 1 +//#define MIDI_SVDEBUG 1 MIDIFileReader::MIDIFileReader(QString path, @@ -278,7 +278,7 @@ m_error = ""; #ifdef MIDI_DEBUG - DEBUG << "MIDIFileReader::open() : fileName = " << m_fileName.c_str() << endl; + SVDEBUG << "MIDIFileReader::open() : fileName = " << m_fileName.c_str() << endl; #endif // Open the file @@ -315,7 +315,7 @@ for (unsigned int j = 0; j < m_numberOfTracks; ++j) { #ifdef MIDI_DEBUG - DEBUG << "Parsing Track " << j << endl; + SVDEBUG << "Parsing Track " << j << endl; #endif if (!skipToNextTrack()) { @@ -350,7 +350,7 @@ } catch (MIDIException e) { - DEBUG << "MIDIFileReader::open() - caught exception - " << e.what() << endl; + SVDEBUG << "MIDIFileReader::open() - caught exception - " << e.what() << endl; m_error = e.what(); } @@ -392,14 +392,14 @@ { if (midiHeader.size() < 14) { #ifdef MIDI_DEBUG - DEBUG << "MIDIFileReader::parseHeader() - file header undersized" << endl; + SVDEBUG << "MIDIFileReader::parseHeader() - file header undersized" << endl; #endif return false; } if (midiHeader.compare(0, 4, MIDI_FILE_HEADER) != 0) { #ifdef MIDI_DEBUG - DEBUG << "MIDIFileReader::parseHeader()" + SVDEBUG << "MIDIFileReader::parseHeader()" << "- file header not found or malformed" << endl; #endif @@ -408,7 +408,7 @@ if (midiBytesToLong(midiHeader.substr(4,4)) != 6L) { #ifdef MIDI_DEBUG - DEBUG << "MIDIFileReader::parseHeader()" + SVDEBUG << "MIDIFileReader::parseHeader()" << " - header length incorrect" << endl; #endif @@ -498,7 +498,7 @@ data1 = midiByte; #ifdef MIDI_DEBUG - DEBUG << "using running status (byte " << int(midiByte) << " found)" << endl; + SVDEBUG << "using running status (byte " << int(midiByte) << " found)" << endl; #endif } else { #ifdef MIDI_DEBUG @@ -611,7 +611,7 @@ MIDI_END_OF_EXCLUSIVE) { #ifdef MIDI_DEBUG - DEBUG << "MIDIFileReader::parseTrack() - " + SVDEBUG << "MIDIFileReader::parseTrack() - " << "malformed or unsupported SysEx type" << endl; #endif @@ -631,14 +631,14 @@ case MIDI_END_OF_EXCLUSIVE: #ifdef MIDI_DEBUG - DEBUG << "MIDIFileReader::parseTrack() - " + SVDEBUG << "MIDIFileReader::parseTrack() - " << "Found a stray MIDI_END_OF_EXCLUSIVE" << endl; #endif break; default: #ifdef MIDI_DEBUG - DEBUG << "MIDIFileReader::parseTrack()" + SVDEBUG << "MIDIFileReader::parseTrack()" << " - Unsupported MIDI Event Code: " << (int)eventCode << endl; #endif @@ -787,15 +787,15 @@ double seconds = (60.0 * quarters) / tempo; /* - DEBUG << "MIDIFileReader::getTimeForMIDITime(" << midiTime << ")" + SVDEBUG << "MIDIFileReader::getTimeForMIDITime(" << midiTime << ")" << endl; - DEBUG << "timing division = " << td << endl; + SVDEBUG << "timing division = " << td << endl; std::cerr << "nearest tempo event (of " << m_tempoMap.size() << ") is at " << tempoMIDITime << " (" << tempoRealTime << ")" << std::endl; std::cerr << "quarters since then = " << quarters << std::endl; std::cerr << "tempo = " << tempo << " quarters per minute" << std::endl; std::cerr << "seconds since then = " << seconds << std::endl; - DEBUG << "resulting time = " << (tempoRealTime + RealTime::fromSeconds(seconds)) << endl; + SVDEBUG << "resulting time = " << (tempoRealTime + RealTime::fromSeconds(seconds)) << endl; */ return tempoRealTime + RealTime::fromSeconds(seconds); @@ -1033,7 +1033,7 @@ Note note(startFrame, (*i)->getPitch(), endFrame - startFrame, level, noteLabel); -// DEBUG << "Adding note " << startFrame << "," << (endFrame-startFrame) << " : " << int((*i)->getPitch()) << endl; +// SVDEBUG << "Adding note " << startFrame << "," << (endFrame-startFrame) << " : " << int((*i)->getPitch()) << endl; model->addPoint(note); break;
--- a/data/fileio/MP3FileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/MP3FileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -177,7 +177,7 @@ id3_tag *tag = id3_file_tag(file); if (!tag) { #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: No ID3 tag found" << endl; + SVDEBUG << "MP3FileReader::loadTags: No ID3 tag found" << endl; #endif id3_file_close(file); return; @@ -200,7 +200,7 @@ #else #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: ID3 tag support not compiled in" + SVDEBUG << "MP3FileReader::loadTags: ID3 tag support not compiled in" << endl; #endif #endif @@ -215,20 +215,20 @@ id3_frame *frame = id3_tag_findframe(tag, name, 0); if (!frame) { #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: No \"" << name << "\" in ID3 tag" << endl; + SVDEBUG << "MP3FileReader::loadTags: No \"" << name << "\" in ID3 tag" << endl; #endif return ""; } if (frame->nfields < 2) { - DEBUG << "MP3FileReader::loadTags: WARNING: Not enough fields (" << frame->nfields << ") for \"" << name << "\" in ID3 tag" << endl; + SVDEBUG << "MP3FileReader::loadTags: WARNING: Not enough fields (" << frame->nfields << ") for \"" << name << "\" in ID3 tag" << endl; return ""; } unsigned int nstrings = id3_field_getnstrings(&frame->fields[1]); if (nstrings == 0) { #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: No strings for \"" << name << "\" in ID3 tag" << endl; + SVDEBUG << "MP3FileReader::loadTags: No strings for \"" << name << "\" in ID3 tag" << endl; #endif return ""; } @@ -236,7 +236,7 @@ id3_ucs4_t const *ustr = id3_field_getstrings(&frame->fields[1], 0); if (!ustr) { #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: Invalid or absent data for \"" << name << "\" in ID3 tag" << endl; + SVDEBUG << "MP3FileReader::loadTags: Invalid or absent data for \"" << name << "\" in ID3 tag" << endl; #endif return ""; } @@ -251,7 +251,7 @@ free(u8str); #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: tag \"" << name << "\" -> \"" + SVDEBUG << "MP3FileReader::loadTags: tag \"" << name << "\" -> \"" << rv << "\"" << endl; #endif @@ -365,7 +365,7 @@ initialiseDecodeCache(); if (m_cacheMode == CacheInTemporaryFile) { -// DEBUG << "MP3FileReader::accept: channel count " << m_channelCount << ", file rate " << m_fileRate << ", about to start serialised section" << endl; +// SVDEBUG << "MP3FileReader::accept: channel count " << m_channelCount << ", file rate " << m_fileRate << ", about to start serialised section" << endl; startSerialised("MP3FileReader::Decode"); } }
--- a/data/fileio/MatchFileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/MatchFileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -86,7 +86,7 @@ MatchFileReader::~MatchFileReader() { if (m_file) { - DEBUG << "MatchFileReader::MatchFileReader: Closing file" << endl; + SVDEBUG << "MatchFileReader::MatchFileReader: Closing file" << endl; m_file->close(); } delete m_file;
--- a/data/fileio/MatrixFile.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/MatrixFile.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -68,7 +68,7 @@ Profiler profiler("MatrixFile::MatrixFile", true); #ifdef DEBUG_MATRIX_FILE - DEBUG << "MatrixFile::MatrixFile(" << fileBase << ", " << int(mode) << ", " << cellSize << ", " << width << ", " << height << ")" << endl; + SVDEBUG << "MatrixFile::MatrixFile(" << fileBase << ", " << int(mode) << ", " << cellSize << ", " << width << ", " << height << ")" << endl; #endif m_createMutex.lock(); @@ -248,7 +248,7 @@ MatrixFile::close() { #ifdef DEBUG_MATRIX_FILE - DEBUG << "MatrixFile::close()" << endl; + SVDEBUG << "MatrixFile::close()" << endl; #endif if (m_fd >= 0) { if (::close(m_fd) < 0) {
--- a/data/fileio/OggVorbisFileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/OggVorbisFileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -50,7 +50,7 @@ m_channelCount = 0; m_fileRate = 0; -// DEBUG << "OggVorbisFileReader::OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (++instances) << " instances" << endl; +// SVDEBUG << "OggVorbisFileReader::OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (++instances) << " instances" << endl; Profiler profiler("OggVorbisFileReader::OggVorbisFileReader", true); @@ -102,7 +102,7 @@ OggVorbisFileReader::~OggVorbisFileReader() { -// DEBUG << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (--instances) << " instances" << endl; +// SVDEBUG << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (--instances) << " instances" << endl; if (m_decodeThread) { m_cancelled = true; m_decodeThread->wait();
--- a/data/fileio/QuickTimeFileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/QuickTimeFileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -66,7 +66,7 @@ Profiler profiler("QuickTimeFileReader::QuickTimeFileReader", true); -DEBUG << "QuickTimeFileReader: path is \"" << m_path << "\"" << endl; +SVDEBUG << "QuickTimeFileReader: path is \"" << m_path << "\"" << endl; long QTversion; @@ -270,7 +270,7 @@ QuickTimeFileReader::~QuickTimeFileReader() { - DEBUG << "QuickTimeFileReader::~QuickTimeFileReader" << endl; + SVDEBUG << "QuickTimeFileReader::~QuickTimeFileReader" << endl; if (m_decodeThread) { m_cancelled = true;
--- a/data/fileio/ResamplingWavFileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/ResamplingWavFileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -39,7 +39,7 @@ m_channelCount = 0; m_fileRate = 0; - DEBUG << "ResamplingWavFileReader::ResamplingWavFileReader(\"" + SVDEBUG << "ResamplingWavFileReader::ResamplingWavFileReader(\"" << m_path << "\"): rate " << targetRate << endl; Profiler profiler("ResamplingWavFileReader::ResamplingWavFileReader", true);
--- a/data/fileio/WavFileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/WavFileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -85,7 +85,7 @@ } } -// DEBUG << "WavFileReader::updateFrameCount: now " << m_fileInfo.frames << endl; +// SVDEBUG << "WavFileReader::updateFrameCount: now " << m_fileInfo.frames << endl; m_frameCount = m_fileInfo.frames; @@ -122,7 +122,7 @@ } if ((long)start >= m_fileInfo.frames) { -// DEBUG << "WavFileReader::getInterleavedFrames: " << start +// SVDEBUG << "WavFileReader::getInterleavedFrames: " << start // << " > " << m_fileInfo.frames << endl; return; }
--- a/data/fileio/WavFileWriter.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/WavFileWriter.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -98,7 +98,7 @@ MultiSelection *selection) { if (source->getChannelCount() != m_channels) { - DEBUG << "WavFileWriter::writeModel: Wrong number of channels (" + SVDEBUG << "WavFileWriter::writeModel: Wrong number of channels (" << source->getChannelCount() << " != " << m_channels << ")" << endl; m_error = QString("Failed to write model to audio file '%1'")
--- a/data/midi/MIDIInput.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/midi/MIDIInput.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -50,7 +50,7 @@ void MIDIInput::callback(double timestamp, std::vector<unsigned char> *message) { - DEBUG << "MIDIInput::callback(" << timestamp << ")" << endl; + SVDEBUG << "MIDIInput::callback(" << timestamp << ")" << endl; // In my experience so far, the timings passed to this function // are not reliable enough to use. We request instead an audio // frame time from whatever FrameTimer we have been given, and use @@ -84,7 +84,7 @@ return; } std::cerr << "WARNING: MIDIInput::postEvent: MIDI event queue (capacity " << m_buffer.getSize() << " is full!" << std::endl; - DEBUG << "Waiting for something to be processed" << endl; + SVDEBUG << "Waiting for something to be processed" << endl; #ifdef _WIN32 Sleep(1); #else
--- a/data/midi/rtmidi/RtMidi.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/midi/rtmidi/RtMidi.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -761,7 +761,7 @@ case SND_SEQ_EVENT_PORT_UNSUBSCRIBED: #if defined(__RTMIDI_DEBUG__) - DEBUG << "RtMidiIn::alsaMidiHandler: port connection has closed!\n"; + SVDEBUG << "RtMidiIn::alsaMidiHandler: port connection has closed!\n"; // FIXME: this is called for all unsubscribe events, even ones //not related to this particular connection. As it stands, I //see no data provided in the "source" and "dest" fields so
--- a/data/model/AggregateWaveModel.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/model/AggregateWaveModel.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -29,7 +29,7 @@ i != channelSpecs.end(); ++i) { if (i->model->getSampleRate() != channelSpecs.begin()->model->getSampleRate()) { - DEBUG << "AggregateWaveModel::AggregateWaveModel: WARNING: Component models do not all have the same sample rate" << endl; + SVDEBUG << "AggregateWaveModel::AggregateWaveModel: WARNING: Component models do not all have the same sample rate" << endl; break; } }
--- a/data/model/AlignmentModel.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/model/AlignmentModel.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -141,7 +141,7 @@ AlignmentModel::toReference(size_t frame) const { #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::toReference(" << frame << ")" << endl; + SVDEBUG << "AlignmentModel::toReference(" << frame << ")" << endl; #endif if (!m_path) { if (!m_rawPath) return frame; @@ -154,7 +154,7 @@ AlignmentModel::fromReference(size_t frame) const { #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::fromReference(" << frame << ")" << endl; + SVDEBUG << "AlignmentModel::fromReference(" << frame << ")" << endl; #endif if (!m_reversePath) { if (!m_rawPath) return frame; @@ -194,7 +194,7 @@ m_rawPath->isReady(&completion); #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::pathCompletionChanged: completion = " + SVDEBUG << "AlignmentModel::pathCompletionChanged: completion = " << completion << endl; #endif @@ -242,7 +242,7 @@ } #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::constructPath: " << m_path->getPointCount() << " points, at least " << (2 * m_path->getPointCount() * (3 * sizeof(void *) + sizeof(int) + sizeof(PathPoint))) << " bytes" << endl; + SVDEBUG << "AlignmentModel::constructPath: " << m_path->getPointCount() << " points, at least " << (2 * m_path->getPointCount() * (3 * sizeof(void *) + sizeof(int) + sizeof(PathPoint))) << " bytes" << endl; #endif } @@ -273,7 +273,7 @@ } #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::constructReversePath: " << m_reversePath->getPointCount() << " points, at least " << (2 * m_reversePath->getPointCount() * (3 * sizeof(void *) + sizeof(int) + sizeof(PathPoint))) << " bytes" << endl; + SVDEBUG << "AlignmentModel::constructReversePath: " << m_reversePath->getPointCount() << " points, at least " << (2 * m_reversePath->getPointCount() * (3 * sizeof(void *) + sizeof(int) + sizeof(PathPoint))) << " bytes" << endl; #endif } @@ -291,13 +291,13 @@ if (points.empty()) { #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::align: No points" << endl; + SVDEBUG << "AlignmentModel::align: No points" << endl; #endif return frame; } #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::align: frame " << frame << " requested" << endl; + SVDEBUG << "AlignmentModel::align: frame " << frame << " requested" << endl; #endif PathModel::Point point(frame); @@ -340,7 +340,7 @@ } #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::align: resultFrame = " << resultFrame << endl; + SVDEBUG << "AlignmentModel::align: resultFrame = " << resultFrame << endl; #endif return resultFrame; @@ -353,11 +353,11 @@ delete m_path; m_path = path; #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::setPath: path = " << m_path << endl; + SVDEBUG << "AlignmentModel::setPath: path = " << m_path << endl; #endif constructReversePath(); #ifdef DEBUG_ALIGNMENT_MODEL - DEBUG << "AlignmentModel::setPath: after construction path = " + SVDEBUG << "AlignmentModel::setPath: after construction path = " << m_path << ", rpath = " << m_reversePath << endl; #endif } @@ -368,7 +368,7 @@ QString extraAttributes) const { if (!m_path) { - DEBUG << "AlignmentModel::toXml: no path" << endl; + SVDEBUG << "AlignmentModel::toXml: no path" << endl; return; }
--- a/data/model/EditableDenseThreeDimensionalModel.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/model/EditableDenseThreeDimensionalModel.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -492,7 +492,7 @@ // For historical reasons we read and write "resolution" as "windowSize" - DEBUG << "EditableDenseThreeDimensionalModel::toXml" << endl; + SVDEBUG << "EditableDenseThreeDimensionalModel::toXml" << endl; Model::toXml (out, indent,
--- a/data/model/Model.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/model/Model.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -24,10 +24,10 @@ Model::~Model() { -// DEBUG << "Model::~Model(" << this << ")" << endl; +// SVDEBUG << "Model::~Model(" << this << ")" << endl; if (!m_aboutToDelete) { - DEBUG << "NOTE: Model::~Model(" << this << ", \"" + SVDEBUG << "NOTE: Model::~Model(" << this << ", \"" << objectName() << "\"): Model deleted " << "with no aboutToDelete notification" << endl; } @@ -134,7 +134,7 @@ int Model::getAlignmentCompletion() const { -// DEBUG << "Model::getAlignmentCompletion" << endl; +// SVDEBUG << "Model::getAlignmentCompletion" << endl; if (!m_alignment) { if (m_sourceModel) return m_sourceModel->getAlignmentCompletion(); else return 100;
--- a/data/model/ModelDataTableModel.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/model/ModelDataTableModel.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -195,7 +195,7 @@ void ModelDataTableModel::sort(int column, Qt::SortOrder sortOrder) { -// DEBUG << "ModelDataTableModel::sort(" << column << ", " << sortOrder +// SVDEBUG << "ModelDataTableModel::sort(" << column << ", " << sortOrder // << ")" << endl; int prevCurrent = getCurrentRow(); if (m_sortColumn != column) {
--- a/data/model/PowerOfSqrtTwoZoomConstraint.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/model/PowerOfSqrtTwoZoomConstraint.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -51,7 +51,7 @@ else if (dir == RoundDown) rval = size_t(prevVal + 0.01); else if (val - blockSize < blockSize - prevVal) rval = size_t(val + 0.01); else rval = size_t(prevVal + 0.01); -// DEBUG << "returning " << rval << endl; +// SVDEBUG << "returning " << rval << endl; return rval; } @@ -74,7 +74,7 @@ << (power - minCachePower)); } -// DEBUG << "Testing base " << base << endl; +// SVDEBUG << "Testing base " << base << endl; if (base == blockSize) { result = base;
--- a/data/model/WaveFileModel.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/model/WaveFileModel.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -53,7 +53,7 @@ m_reader = AudioFileReaderFactory::createThreadingReader (m_source, targetRate); if (m_reader) { - DEBUG << "WaveFileModel::WaveFileModel: reader rate: " + SVDEBUG << "WaveFileModel::WaveFileModel: reader rate: " << m_reader->getSampleRate() << endl; } } @@ -115,7 +115,7 @@ prevCompletion = *completion; } #ifdef DEBUG_WAVE_FILE_MODEL - DEBUG << "WaveFileModel::isReady(): ready = " << ready << ", completion = " << (completion ? *completion : -1) << endl; + SVDEBUG << "WaveFileModel::isReady(): ready = " << ready << ", completion = " << (completion ? *completion : -1) << endl; #endif return ready; } @@ -210,7 +210,7 @@ } #ifdef DEBUG_WAVE_FILE_MODEL -// DEBUG << "WaveFileModel::getValues(" << channel << ", " +// SVDEBUG << "WaveFileModel::getValues(" << channel << ", " // << start << ", " << end << "): calling reader" << endl; #endif @@ -534,7 +534,7 @@ } #ifdef DEBUG_WAVE_FILE_MODEL - DEBUG << "returning " << ranges.size() << " ranges" << endl; + SVDEBUG << "returning " << ranges.size() << " ranges" << endl; #endif return; } @@ -607,7 +607,7 @@ m_fillThread->start(); #ifdef DEBUG_WAVE_FILE_MODEL - DEBUG << "WaveFileModel::fillCache: started fill thread" << endl; + SVDEBUG << "WaveFileModel::fillCache: started fill thread" << endl; #endif } @@ -617,7 +617,7 @@ if (m_fillThread) { size_t fillExtent = m_fillThread->getFillExtent(); #ifdef DEBUG_WAVE_FILE_MODEL - DEBUG << "WaveFileModel::fillTimerTimedOut: extent = " << fillExtent << endl; + SVDEBUG << "WaveFileModel::fillTimerTimedOut: extent = " << fillExtent << endl; #endif if (fillExtent > m_lastFillExtent) { emit modelChanged(m_lastFillExtent, fillExtent); @@ -625,7 +625,7 @@ } } else { #ifdef DEBUG_WAVE_FILE_MODEL - DEBUG << "WaveFileModel::fillTimerTimedOut: no thread" << endl; + SVDEBUG << "WaveFileModel::fillTimerTimedOut: no thread" << endl; #endif emit modelChanged(); } @@ -646,7 +646,7 @@ emit modelChanged(); emit ready(); #ifdef DEBUG_WAVE_FILE_MODEL - DEBUG << "WaveFileModel::cacheFilled" << endl; + SVDEBUG << "WaveFileModel::cacheFilled" << endl; #endif } @@ -669,7 +669,7 @@ if (updating) { while (channels == 0 && !m_model.m_exiting) { -// DEBUG << "WaveFileModel::fill: Waiting for channels..." << endl; +// SVDEBUG << "WaveFileModel::fill: Waiting for channels..." << endl; sleep(1); channels = m_model.getChannelCount(); } @@ -690,11 +690,11 @@ updating = m_model.m_reader->isUpdating(); m_frameCount = m_model.getFrameCount(); -// DEBUG << "WaveFileModel::fill: frame = " << frame << ", count = " << m_frameCount << endl; +// SVDEBUG << "WaveFileModel::fill: frame = " << frame << ", count = " << m_frameCount << endl; while (frame < m_frameCount) { -// DEBUG << "WaveFileModel::fill inner loop: frame = " << frame << ", count = " << m_frameCount << ", blocksize " << readBlockSize << endl; +// SVDEBUG << "WaveFileModel::fill inner loop: frame = " << frame << ", count = " << m_frameCount << ", blocksize " << readBlockSize << endl; if (updating && (frame + readBlockSize > m_frameCount)) break;
--- a/data/model/WritableWaveFileModel.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/model/WritableWaveFileModel.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -109,7 +109,7 @@ if (!m_writer) return false; #ifdef DEBUG_WRITABLE_WAVE_FILE_MODEL -// DEBUG << "WritableWaveFileModel::addSamples(" << count << ")" << endl; +// SVDEBUG << "WritableWaveFileModel::addSamples(" << count << ")" << endl; #endif if (!m_writer->writeSamples(samples, count)) { @@ -123,12 +123,12 @@ if (m_reader && m_reader->getChannelCount() == 0) { #ifdef DEBUG_WRITABLE_WAVE_FILE_MODEL - DEBUG << "WritableWaveFileModel::addSamples(" << count << "): calling updateFrameCount (initial)" << endl; + SVDEBUG << "WritableWaveFileModel::addSamples(" << count << "): calling updateFrameCount (initial)" << endl; #endif m_reader->updateFrameCount(); } else if (++updateCounter == 100) { #ifdef DEBUG_WRITABLE_WAVE_FILE_MODEL - DEBUG << "WritableWaveFileModel::addSamples(" << count << "): calling updateFrameCount (periodic)" << endl; + SVDEBUG << "WritableWaveFileModel::addSamples(" << count << "): calling updateFrameCount (periodic)" << endl; #endif if (m_reader) m_reader->updateFrameCount(); updateCounter = 0; @@ -141,7 +141,7 @@ WritableWaveFileModel::isOK() const { bool ok = (m_writer && m_writer->isOK()); -// DEBUG << "WritableWaveFileModel::isOK(): ok = " << ok << endl; +// SVDEBUG << "WritableWaveFileModel::isOK(): ok = " << ok << endl; return ok; } @@ -164,7 +164,7 @@ size_t WritableWaveFileModel::getFrameCount() const { -// DEBUG << "WritableWaveFileModel::getFrameCount: count = " << m_frameCount << endl; +// SVDEBUG << "WritableWaveFileModel::getFrameCount: count = " << m_frameCount << endl; return m_frameCount; }
--- a/data/osc/OSCQueue.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/osc/OSCQueue.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -167,7 +167,7 @@ return; } std::cerr << "WARNING: OSCQueue::postMessage: OSC message queue (capacity " << m_buffer.getSize() << " is full!" << std::endl; - DEBUG << "Waiting for something to be processed" << endl; + SVDEBUG << "Waiting for something to be processed" << endl; #ifdef _WIN32 Sleep(1); #else @@ -178,7 +178,7 @@ OSCMessage *mp = new OSCMessage(message); m_buffer.write(&mp, 1); - DEBUG << "OSCQueue::postMessage: Posted OSC message: target " + SVDEBUG << "OSCQueue::postMessage: Posted OSC message: target " << message.getTarget() << ", target data " << message.getTargetData() << ", method " << message.getMethod() << endl; emit messagesAvailable(); @@ -219,7 +219,7 @@ return false; } - DEBUG << "OSCQueue::parseOSCPath: good path \"" << path << "\"" << endl; + SVDEBUG << "OSCQueue::parseOSCPath: good path \"" << path << "\"" << endl; return true; }
--- a/plugin/DSSIPluginFactory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/DSSIPluginFactory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -69,7 +69,7 @@ const LADSPA_Descriptor *descriptor = ddesc->LADSPA_Plugin; if (!descriptor) continue; -// DEBUG << "DSSIPluginFactory::enumeratePlugins: Name " << (descriptor->Name ? descriptor->Name : "NONE" ) << endl; +// SVDEBUG << "DSSIPluginFactory::enumeratePlugins: Name " << (descriptor->Name ? descriptor->Name : "NONE" ) << endl; list.push_back(*i); list.push_back(descriptor->Name);
--- a/plugin/DSSIPluginInstance.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/DSSIPluginInstance.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -77,7 +77,7 @@ m_haveLastEventSendTime(false) { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::DSSIPluginInstance(" << identifier << ")" + SVDEBUG << "DSSIPluginInstance::DSSIPluginInstance(" << identifier << ")" << endl; #endif @@ -177,7 +177,7 @@ DSSIPluginInstance::getParameter(std::string id) const { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::getParameter(" << id << ")" << endl; + SVDEBUG << "DSSIPluginInstance::getParameter(" << id << ")" << endl; #endif for (unsigned int i = 0; i < m_controlPortsIn.size(); ++i) { if (id == m_descriptor->LADSPA_Plugin->PortNames[m_controlPortsIn[i].first]) { @@ -186,7 +186,7 @@ #endif float v = getParameterValue(i); #ifdef DEBUG_DSSI - DEBUG << "Returning " << v << endl; + SVDEBUG << "Returning " << v << endl; #endif return v; } @@ -199,7 +199,7 @@ DSSIPluginInstance::setParameter(std::string id, float value) { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::setParameter(" << id << ", " << value << ")" << endl; + SVDEBUG << "DSSIPluginInstance::setParameter(" << id << ", " << value << ")" << endl; #endif for (unsigned int i = 0; i < m_controlPortsIn.size(); ++i) { @@ -214,7 +214,7 @@ DSSIPluginInstance::init() { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::init" << endl; + SVDEBUG << "DSSIPluginInstance::init" << endl; #endif // Discover ports numbers and identities @@ -258,7 +258,7 @@ } #ifdef DEBUG_DSSI else - DEBUG << "DSSIPluginInstance::DSSIPluginInstance - " + SVDEBUG << "DSSIPluginInstance::DSSIPluginInstance - " << "unrecognised port type" << endl; #endif } @@ -272,7 +272,7 @@ size_t latency = 0; #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::getLatency(): m_latencyPort " << m_latencyPort << ", m_run " << m_run << endl; + SVDEBUG << "DSSIPluginInstance::getLatency(): m_latencyPort " << m_latencyPort << ", m_run " << m_run << endl; #endif if (m_latencyPort) { @@ -288,7 +288,7 @@ } #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::getLatency(): latency is " << latency << endl; + SVDEBUG << "DSSIPluginInstance::getLatency(): latency is " << latency << endl; #endif return latency; @@ -313,7 +313,7 @@ DSSIPluginInstance::setIdealChannelCount(size_t channels) { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::setIdealChannelCount: channel count " + SVDEBUG << "DSSIPluginInstance::setIdealChannelCount: channel count " << channels << " (was " << m_idealChannelCount << ")" << endl; #endif @@ -401,7 +401,7 @@ DSSIPluginInstance::~DSSIPluginInstance() { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::~DSSIPluginInstance" << endl; + SVDEBUG << "DSSIPluginInstance::~DSSIPluginInstance" << endl; #endif if (m_threads.find(m_instanceHandle) != m_threads.end()) { @@ -502,7 +502,7 @@ m_cachedPrograms.clear(); #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::checkProgramCache" << endl; + SVDEBUG << "DSSIPluginInstance::checkProgramCache" << endl; #endif if (!m_descriptor || !m_descriptor->get_program) { @@ -522,7 +522,7 @@ } #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::checkProgramCache: have " << m_cachedPrograms.size() << " programs" << endl; + SVDEBUG << "DSSIPluginInstance::checkProgramCache: have " << m_cachedPrograms.size() << " programs" << endl; #endif m_programCacheValid = true; @@ -532,7 +532,7 @@ DSSIPluginInstance::getPrograms() const { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::getPrograms" << endl; + SVDEBUG << "DSSIPluginInstance::getPrograms" << endl; #endif if (!m_descriptor) return ProgramList(); @@ -553,7 +553,7 @@ DSSIPluginInstance::getProgram(int bank, int program) const { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::getProgram(" << bank << "," << program << ")" << endl; + SVDEBUG << "DSSIPluginInstance::getProgram(" << bank << "," << program << ")" << endl; #endif if (!m_descriptor) return std::string(); @@ -572,7 +572,7 @@ DSSIPluginInstance::getProgram(std::string name) const { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::getProgram(" << name << ")" << endl; + SVDEBUG << "DSSIPluginInstance::getProgram(" << name << ")" << endl; #endif if (!m_descriptor) return 0; @@ -609,7 +609,7 @@ DSSIPluginInstance::selectProgramAux(std::string program, bool backupPortValues) { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::selectProgram(" << program << ")" << endl; + SVDEBUG << "DSSIPluginInstance::selectProgram(" << program << ")" << endl; #endif if (!m_descriptor) return; @@ -631,7 +631,7 @@ found = true; #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::selectProgram(" << program << "): found at bank " << bankNo << ", program " << programNo << endl; + SVDEBUG << "DSSIPluginInstance::selectProgram(" << program << "): found at bank " << bankNo << ", program " << programNo << endl; #endif break; @@ -647,7 +647,7 @@ m_processLock.unlock(); #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::selectProgram(" << program << "): made select_program(" << bankNo << "," << programNo << ") call" << endl; + SVDEBUG << "DSSIPluginInstance::selectProgram(" << program << "): made select_program(" << bankNo << "," << programNo << ") call" << endl; #endif if (backupPortValues) { @@ -661,7 +661,7 @@ DSSIPluginInstance::activate() { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::activate" << endl; + SVDEBUG << "DSSIPluginInstance::activate" << endl; #endif if (!m_descriptor || !m_descriptor->LADSPA_Plugin->activate) return; @@ -669,14 +669,14 @@ if (m_program != "") { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::activate: restoring program " << m_program << endl; + SVDEBUG << "DSSIPluginInstance::activate: restoring program " << m_program << endl; #endif selectProgramAux(m_program, false); } for (size_t i = 0; i < m_backupControlPortsIn.size(); ++i) { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::activate: setting port " << m_controlPortsIn[i].first << " to " << m_backupControlPortsIn[i] << endl; + SVDEBUG << "DSSIPluginInstance::activate: setting port " << m_controlPortsIn[i].first << " to " << m_backupControlPortsIn[i] << endl; #endif *m_controlPortsIn[i].second = m_backupControlPortsIn[i]; } @@ -687,7 +687,7 @@ { if (!m_descriptor || !m_descriptor->LADSPA_Plugin->connect_port) return; #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::connectPorts: " << m_audioPortsIn.size() + SVDEBUG << "DSSIPluginInstance::connectPorts: " << m_audioPortsIn.size() << " audio ports in, " << m_audioPortsOut.size() << " out, " << m_outputBufferCount << " output buffers" << endl; #endif @@ -726,7 +726,7 @@ *m_controlPortsIn[i].second = defaultValue; m_backupControlPortsIn[i] = defaultValue; #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::connectPorts: set control port " << i << " to default value " << defaultValue << endl; + SVDEBUG << "DSSIPluginInstance::connectPorts: set control port " << i << " to default value " << defaultValue << endl; #endif } } @@ -749,7 +749,7 @@ DSSIPluginInstance::setParameterValue(unsigned int parameter, float value) { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::setParameterValue(" << parameter << ") to " << value << endl; + SVDEBUG << "DSSIPluginInstance::setParameterValue(" << parameter << ") to " << value << endl; #endif if (parameter >= m_controlPortsIn.size()) return; @@ -773,7 +773,7 @@ DSSIPluginInstance::setPortValueFromController(unsigned int port, int cv) { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::setPortValueFromController(" << port << ") to " << cv << endl; + SVDEBUG << "DSSIPluginInstance::setPortValueFromController(" << port << ") to " << cv << endl; #endif const LADSPA_Descriptor *p = m_descriptor->LADSPA_Plugin; @@ -819,7 +819,7 @@ DSSIPluginInstance::getParameterValue(unsigned int parameter) const { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::getParameterValue(" << parameter << ")" << endl; + SVDEBUG << "DSSIPluginInstance::getParameterValue(" << parameter << ")" << endl; #endif if (parameter >= m_controlPortsIn.size()) return 0.0; return (*m_controlPortsIn[parameter].second); @@ -869,7 +869,7 @@ #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::configure(" << key << "," << value << ")" << endl; + SVDEBUG << "DSSIPluginInstance::configure(" << key << "," << value << ")" << endl; #endif char *message = m_descriptor->configure(m_instanceHandle, @@ -908,7 +908,7 @@ const void *e) { #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::sendEvent: last was " << m_lastEventSendTime << " (valid " << m_haveLastEventSendTime << "), this is " << eventTime << endl; + SVDEBUG << "DSSIPluginInstance::sendEvent: last was " << m_lastEventSendTime << " (valid " << m_haveLastEventSendTime << "), this is " << eventTime << endl; #endif // The process mechanism only works correctly if the events are @@ -926,7 +926,7 @@ snd_seq_event_t *event = (snd_seq_event_t *)e; #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::sendEvent at " << eventTime << endl; + SVDEBUG << "DSSIPluginInstance::sendEvent at " << eventTime << endl; #endif snd_seq_event_t ev(*event); @@ -955,7 +955,7 @@ int controller = ev->data.control.param; #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::handleController " << controller << endl; + SVDEBUG << "DSSIPluginInstance::handleController " << controller << endl; #endif if (controller == 0) { // bank select MSB @@ -1020,12 +1020,12 @@ } #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::run(" << blockTime << ")" << endl; + SVDEBUG << "DSSIPluginInstance::run(" << blockTime << ")" << endl; #endif #ifdef DEBUG_DSSI_PROCESS if (m_eventBuffer.getReadSpace() > 0) { - DEBUG << "DSSIPluginInstance::run: event buffer has " + SVDEBUG << "DSSIPluginInstance::run: event buffer has " << m_eventBuffer.getReadSpace() << " event(s) in it" << endl; } #endif @@ -1044,7 +1044,7 @@ } #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::run: evTime " << evTime << ", blockTime " << blockTime << ", frameOffset " << frameOffset + SVDEBUG << "DSSIPluginInstance::run: evTime " << evTime << ", blockTime " << blockTime << ", frameOffset " << frameOffset << ", blockSize " << m_blockSize << endl; std::cerr << "Type: " << int(ev->type) << ", pitch: " << int(ev->data.note.note) << ", velocity: " << int(ev->data.note.velocity) << std::endl; #endif @@ -1079,19 +1079,19 @@ int bank = m_pending.lsb + 128 * m_pending.msb; #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::run: making select_program(" << bank << "," << program << ") call" << endl; + SVDEBUG << "DSSIPluginInstance::run: making select_program(" << bank << "," << program << ") call" << endl; #endif m_pending.lsb = m_pending.msb = m_pending.program = -1; m_descriptor->select_program(m_instanceHandle, bank, program); #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::run: made select_program(" << bank << "," << program << ") call" << endl; + SVDEBUG << "DSSIPluginInstance::run: made select_program(" << bank << "," << program << ") call" << endl; #endif } #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::run: running with " << evCount << " events" + SVDEBUG << "DSSIPluginInstance::run: running with " << evCount << " events" << endl; #endif @@ -1153,7 +1153,7 @@ PluginSet &s = m_groupMap[m_identifier]; #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): this is " << this << "; " << s.size() << " elements in m_groupMap[" << m_identifier << "]" << endl; + SVDEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): this is " << this << "; " << s.size() << " elements in m_groupMap[" << m_identifier << "]" << endl; #endif if (m_lastRunTime != blockTime) { @@ -1161,7 +1161,7 @@ DSSIPluginInstance *instance = *i; if (instance != this && instance->m_lastRunTime == blockTime) { #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): plugin " << instance << " has already been run" << endl; + SVDEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): plugin " << instance << " has already been run" << endl; #endif needRun = false; } @@ -1170,13 +1170,13 @@ if (!needRun) { #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): already run, returning" << endl; + SVDEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): already run, returning" << endl; #endif return; } #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): I'm the first, running" << endl; + SVDEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): I'm the first, running" << endl; #endif size_t index = 0; @@ -1194,7 +1194,7 @@ instances[index] = instance->m_instanceHandle; #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): running " << instance << endl; + SVDEBUG << "DSSIPluginInstance::runGrouped(" << blockTime << "): running " << instance << endl; #endif if (instance->m_pending.program >= 0 && @@ -1220,7 +1220,7 @@ } #ifdef DEBUG_DSSI_PROCESS - DEBUG << "DSSIPluginInstance::runGrouped: evTime " << evTime << ", frameOffset " << frameOffset + SVDEBUG << "DSSIPluginInstance::runGrouped: evTime " << evTime << ", frameOffset " << frameOffset << ", block size " << m_blockSize << endl; #endif @@ -1259,7 +1259,7 @@ { // This is called from a non-RT context (during instantiate) - DEBUG << "DSSIPluginInstance::requestMidiSend" << endl; + SVDEBUG << "DSSIPluginInstance::requestMidiSend" << endl; return 1; } @@ -1270,7 +1270,7 @@ { // This is likely to be called from an RT context - DEBUG << "DSSIPluginInstance::midiSend" << endl; + SVDEBUG << "DSSIPluginInstance::midiSend" << endl; } void @@ -1296,7 +1296,7 @@ DSSIPluginInstance::deactivate() { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::deactivate " << m_identifier << endl; + SVDEBUG << "DSSIPluginInstance::deactivate " << m_identifier << endl; #endif if (!m_descriptor || !m_descriptor->LADSPA_Plugin->deactivate) return; @@ -1306,7 +1306,7 @@ m_descriptor->LADSPA_Plugin->deactivate(m_instanceHandle); #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::deactivate " << m_identifier << " done" << endl; + SVDEBUG << "DSSIPluginInstance::deactivate " << m_identifier << " done" << endl; #endif m_bufferScavenger.scavenge(); @@ -1316,7 +1316,7 @@ DSSIPluginInstance::cleanup() { #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::cleanup " << m_identifier << endl; + SVDEBUG << "DSSIPluginInstance::cleanup " << m_identifier << endl; #endif if (!m_descriptor) return; @@ -1331,7 +1331,7 @@ m_descriptor->LADSPA_Plugin->cleanup(m_instanceHandle); m_instanceHandle = 0; #ifdef DEBUG_DSSI - DEBUG << "DSSIPluginInstance::cleanup " << m_identifier << " done" << endl; + SVDEBUG << "DSSIPluginInstance::cleanup " << m_identifier << " done" << endl; #endif }
--- a/plugin/FeatureExtractionPluginFactory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/FeatureExtractionPluginFactory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -58,7 +58,7 @@ { if (pluginType == "vamp") { if (!_nativeInstance) { -// DEBUG << "FeatureExtractionPluginFactory::instance(" << pluginType// << "): creating new FeatureExtractionPluginFactory" << endl; +// SVDEBUG << "FeatureExtractionPluginFactory::instance(" << pluginType// << "): creating new FeatureExtractionPluginFactory" << endl; _nativeInstance = new FeatureExtractionPluginFactory(); } return _nativeInstance; @@ -117,7 +117,7 @@ for (std::vector<QString>::iterator i = path.begin(); i != path.end(); ++i) { #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: scanning directory " << i-<< endl; + SVDEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: scanning directory " << i-<< endl; #endif QDir pluginDir(*i, PLUGIN_GLOB, @@ -129,7 +129,7 @@ QString soname = pluginDir.filePath(pluginDir[j]); #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: trying potential library " << soname << endl; + SVDEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: trying potential library " << soname << endl; #endif void *libraryHandle = DLOPEN(soname, RTLD_LAZY | RTLD_LOCAL); @@ -140,7 +140,7 @@ } #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: It's a library all right, checking for descriptor" << endl; + SVDEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: It's a library all right, checking for descriptor" << endl; #endif VampGetPluginDescriptorFunction fn = (VampGetPluginDescriptorFunction) @@ -155,7 +155,7 @@ } #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: Vamp descriptor found" << endl; + SVDEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: Vamp descriptor found" << endl; #endif const VampPluginDescriptor *descriptor = 0; @@ -173,7 +173,7 @@ << descriptor->identifier << "\" at indices " << known[descriptor->identifier] << " and " << index << std::endl; - DEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: Avoiding this library (obsolete API?)" << endl; + SVDEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: Avoiding this library (obsolete API?)" << endl; ok = false; break; } else { @@ -193,7 +193,7 @@ ("vamp", soname, descriptor->identifier); rv.push_back(id); #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: Found plugin id " << id << " at index " << index << endl; + SVDEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: Found plugin id " << id << " at index " << index << endl; #endif ++index; } @@ -216,7 +216,7 @@ QString file = ""; #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::findPluginFile(\"" + SVDEBUG << "FeatureExtractionPluginFactory::findPluginFile(\"" << soname << "\", \"" << inDir << "\")" << endl; #endif @@ -233,7 +233,7 @@ if (QFileInfo(file).exists() && QFileInfo(file).isFile()) { #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::findPluginFile: " + SVDEBUG << "FeatureExtractionPluginFactory::findPluginFile: " << "found trivially at " << file << endl; #endif @@ -245,7 +245,7 @@ if (QFileInfo(file).baseName() == QFileInfo(soname).baseName()) { #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::findPluginFile: " + SVDEBUG << "FeatureExtractionPluginFactory::findPluginFile: " << "found \"" << soname << "\" at " << file << endl; #endif @@ -254,7 +254,7 @@ } #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::findPluginFile (with dir): " + SVDEBUG << "FeatureExtractionPluginFactory::findPluginFile (with dir): " << "not found" << endl; #endif @@ -266,7 +266,7 @@ if (fi.isAbsolute() && fi.exists() && fi.isFile()) { #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::findPluginFile: " + SVDEBUG << "FeatureExtractionPluginFactory::findPluginFile: " << "found trivially at " << soname << endl; #endif return soname; @@ -287,7 +287,7 @@ } #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::findPluginFile: " + SVDEBUG << "FeatureExtractionPluginFactory::findPluginFile: " << "not found" << endl; #endif @@ -310,7 +310,7 @@ QString type, soname, label; PluginIdentifier::parseIdentifier(identifier, type, soname, label); if (type != "vamp") { - DEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Wrong factory for plugin type " << type << endl; + SVDEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Wrong factory for plugin type " << type << endl; return 0; } @@ -322,7 +322,7 @@ } else if (found != soname) { #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE - DEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Given library name was " << soname << ", found at " << found << endl; + SVDEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Given library name was " << soname << ", found at " << found << endl; std::cerr << soname << " -> " << found << std::endl; #endif @@ -341,7 +341,7 @@ DLSYM(libraryHandle, "vampGetPluginDescriptor"); if (!fn) { - DEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: No descriptor function in " << soname << endl; + SVDEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: No descriptor function in " << soname << endl; goto done; } @@ -362,7 +362,7 @@ rv = new PluginDeletionNotifyAdapter(plugin, this); } -// DEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Constructed Vamp plugin, rv is " << rv << endl; +// SVDEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Constructed Vamp plugin, rv is " << rv << endl; //!!! need to dlclose() when plugins from a given library are unloaded @@ -373,7 +373,7 @@ } } -// DEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Instantiated plugin " << label << " from library " << soname << ": descriptor " << descriptor << ", rv "<< rv << ", label " << rv->getName() << ", outputs " << rv->getOutputDescriptors().size() << endl; +// SVDEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Instantiated plugin " << label << " from library " << soname << ": descriptor " << descriptor << ", rv "<< rv << ", label " << rv->getName() << ", outputs " << rv->getOutputDescriptors().size() << endl; return rv; } @@ -383,7 +383,7 @@ { void *handle = m_handleMap[plugin]; if (handle) { -// DEBUG << "unloading library " << handle << " for plugin " << plugin << endl; +// SVDEBUG << "unloading library " << handle << " for plugin " << plugin << endl; DLCLOSE(handle); } m_handleMap.erase(plugin); @@ -415,12 +415,12 @@ QDir dir(path[i], "*.cat"); -// DEBUG << "LADSPAPluginFactory::generateFallbackCategories: directory " << path[i] << " has " << dir.count() << " .cat files" << endl; +// SVDEBUG << "LADSPAPluginFactory::generateFallbackCategories: directory " << path[i] << " has " << dir.count() << " .cat files" << endl; for (unsigned int j = 0; j < dir.count(); ++j) { QFile file(path[i] + "/" + dir[j]); -// DEBUG << "LADSPAPluginFactory::generateFallbackCategories: about to open " << (path[i]+ "/" + dir[j]) << endl; +// SVDEBUG << "LADSPAPluginFactory::generateFallbackCategories: about to open " << (path[i]+ "/" + dir[j]) << endl; if (file.open(QIODevice::ReadOnly)) { // std::cerr << "...opened" << std::endl;
--- a/plugin/LADSPAPluginFactory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/LADSPAPluginFactory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -227,7 +227,7 @@ else logmax = log10f(maximum); } -// DEBUG << "LADSPAPluginFactory::getPortDefault: hint = " << d << endl; +// SVDEBUG << "LADSPAPluginFactory::getPortDefault: hint = " << d << endl; if (!LADSPA_IS_HINT_HAS_DEFAULT(d)) { @@ -349,7 +349,7 @@ m_instances.insert(instance); #ifdef DEBUG_LADSPA_PLUGIN_FACTORY - DEBUG << "LADSPAPluginFactory::instantiatePlugin(" + SVDEBUG << "LADSPAPluginFactory::instantiatePlugin(" << identifier << ": now have " << m_instances.size() << " instances" << endl; #endif @@ -384,7 +384,7 @@ PluginIdentifier::parseIdentifier((*ii)->getPluginIdentifier(), itype, isoname, ilabel); if (isoname == soname) { #ifdef DEBUG_LADSPA_PLUGIN_FACTORY - DEBUG << "LADSPAPluginFactory::releasePlugin: dll " << soname << " is still in use for plugin " << ilabel << endl; + SVDEBUG << "LADSPAPluginFactory::releasePlugin: dll " << soname << " is still in use for plugin " << ilabel << endl; #endif stillInUse = true; break; @@ -394,14 +394,14 @@ if (!stillInUse) { if (soname != PluginIdentifier::BUILTIN_PLUGIN_SONAME) { #ifdef DEBUG_LADSPA_PLUGIN_FACTORY - DEBUG << "LADSPAPluginFactory::releasePlugin: dll " << soname << " no longer in use, unloading" << endl; + SVDEBUG << "LADSPAPluginFactory::releasePlugin: dll " << soname << " no longer in use, unloading" << endl; #endif unloadLibrary(soname); } } #ifdef DEBUG_LADSPA_PLUGIN_FACTORY - DEBUG << "LADSPAPluginFactory::releasePlugin(" + SVDEBUG << "LADSPAPluginFactory::releasePlugin(" << identifier << ": now have " << m_instances.size() << " instances" << endl; #endif } @@ -449,7 +449,7 @@ void *libraryHandle = DLOPEN(soName, RTLD_NOW); if (libraryHandle) { m_libraryHandles[soName] = libraryHandle; - DEBUG << "LADSPAPluginFactory::loadLibrary: Loaded library \"" << soName << "\"" << endl; + SVDEBUG << "LADSPAPluginFactory::loadLibrary: Loaded library \"" << soName << "\"" << endl; return; } @@ -468,7 +468,7 @@ i != pathList.end(); ++i) { #ifdef DEBUG_LADSPA_PLUGIN_FACTORY - DEBUG << "Looking at: " << (*i) << endl; + SVDEBUG << "Looking at: " << (*i) << endl; #endif QDir dir(*i, PLUGIN_GLOB, @@ -509,7 +509,7 @@ { LibraryHandleMap::iterator li = m_libraryHandles.find(soName); if (li != m_libraryHandles.end()) { -// DEBUG << "unloading " << soname << endl; +// SVDEBUG << "unloading " << soname << endl; DLCLOSE(m_libraryHandles[soName]); m_libraryHandles.erase(li); } @@ -633,13 +633,13 @@ std::vector<QString> pathList = getPluginPath(); -// DEBUG << "LADSPAPluginFactory::discoverPlugins - " +// SVDEBUG << "LADSPAPluginFactory::discoverPlugins - " // << "discovering plugins; path is "; // for (std::vector<QString>::iterator i = pathList.begin(); // i != pathList.end(); ++i) { -// DEBUG << "[" << i-<< "] "; +// SVDEBUG << "[" << i-<< "] "; // } -// DEBUG << endl; +// SVDEBUG << endl; #ifdef HAVE_LRDF // read the description files @@ -818,22 +818,22 @@ path.push_back(p); p.replace("/lib/", "/share/"); path.push_back(p); -// DEBUG << "LADSPAPluginFactory::generateFallbackCategories: path element " << p << endl; +// SVDEBUG << "LADSPAPluginFactory::generateFallbackCategories: path element " << p << endl; } path.push_back(pluginPath[i]); -// DEBUG << "LADSPAPluginFactory::generateFallbackCategories: path element " << pluginPath[i] << endl; +// SVDEBUG << "LADSPAPluginFactory::generateFallbackCategories: path element " << pluginPath[i] << endl; } for (size_t i = 0; i < path.size(); ++i) { QDir dir(path[i], "*.cat"); -// DEBUG << "LADSPAPluginFactory::generateFallbackCategories: directory " << path[i] << " has " << dir.count() << " .cat files" << endl; +// SVDEBUG << "LADSPAPluginFactory::generateFallbackCategories: directory " << path[i] << " has " << dir.count() << " .cat files" << endl; for (unsigned int j = 0; j < dir.count(); ++j) { QFile file(path[i] + "/" + dir[j]); -// DEBUG << "LADSPAPluginFactory::generateFallbackCategories: about to open " << (path[i]+ "/" + dir[j]) << endl; +// SVDEBUG << "LADSPAPluginFactory::generateFallbackCategories: about to open " << (path[i]+ "/" + dir[j]) << endl; if (file.open(QIODevice::ReadOnly)) { // std::cerr << "...opened" << std::endl;
--- a/plugin/LADSPAPluginInstance.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/LADSPAPluginInstance.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -207,7 +207,7 @@ for (unsigned int i = 0; i < m_controlPortsIn.size(); ++i) { if (id == m_descriptor->PortNames[m_controlPortsIn[i].first]) { #ifdef DEBUG_LADSPA - DEBUG << "LADSPAPluginInstance::setParameter: Found id " + SVDEBUG << "LADSPAPluginInstance::setParameter: Found id " << id << " at control port " << i << endl; #endif setParameterValue(i, value); @@ -220,7 +220,7 @@ LADSPAPluginInstance::init(int idealChannelCount) { #ifdef DEBUG_LADSPA - DEBUG << "LADSPAPluginInstance::init(" << idealChannelCount << "): plugin has " + SVDEBUG << "LADSPAPluginInstance::init(" << idealChannelCount << "): plugin has " << m_descriptor->PortCount << " ports" << endl; #endif @@ -232,12 +232,12 @@ if (LADSPA_IS_PORT_INPUT(m_descriptor->PortDescriptors[i])) { #ifdef DEBUG_LADSPA - DEBUG << "LADSPAPluginInstance::init: port " << i << " is audio in" << endl; + SVDEBUG << "LADSPAPluginInstance::init: port " << i << " is audio in" << endl; #endif m_audioPortsIn.push_back(i); } else { #ifdef DEBUG_LADSPA - DEBUG << "LADSPAPluginInstance::init: port " << i << " is audio out" << endl; + SVDEBUG << "LADSPAPluginInstance::init: port " << i << " is audio out" << endl; #endif m_audioPortsOut.push_back(i); } @@ -247,7 +247,7 @@ if (LADSPA_IS_PORT_INPUT(m_descriptor->PortDescriptors[i])) { #ifdef DEBUG_LADSPA - DEBUG << "LADSPAPluginInstance::init: port " << i << " is control in" << endl; + SVDEBUG << "LADSPAPluginInstance::init: port " << i << " is control in" << endl; #endif LADSPA_Data *data = new LADSPA_Data(0.0); m_controlPortsIn.push_back( @@ -256,7 +256,7 @@ } else { #ifdef DEBUG_LADSPA - DEBUG << "LADSPAPluginInstance::init: port " << i << " is control out" << endl; + SVDEBUG << "LADSPAPluginInstance::init: port " << i << " is control out" << endl; #endif LADSPA_Data *data = new LADSPA_Data(0.0); m_controlPortsOut.push_back( @@ -273,7 +273,7 @@ } #ifdef DEBUG_LADSPA else - DEBUG << "LADSPAPluginInstance::init - " + SVDEBUG << "LADSPAPluginInstance::init - " << "unrecognised port type" << endl; #endif } @@ -341,7 +341,7 @@ LADSPAPluginInstance::~LADSPAPluginInstance() { #ifdef DEBUG_LADSPA - DEBUG << "LADSPAPluginInstance::~LADSPAPluginInstance" << endl; + SVDEBUG << "LADSPAPluginInstance::~LADSPAPluginInstance" << endl; #endif if (m_instanceHandles.size() != 0) { // "isOK()"
--- a/plugin/PluginXml.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/PluginXml.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -81,7 +81,7 @@ for (Vamp::PluginBase::ParameterList::const_iterator i = parameters.begin(); i != parameters.end(); ++i) { -// DEBUG << "PluginXml::toXml: parameter name \"" +// SVDEBUG << "PluginXml::toXml: parameter name \"" // << i->name.c_str() << "\" has value " // << m_plugin->getParameter(i->name) << endl; @@ -174,14 +174,14 @@ (QString(i->identifier.c_str()))); if (attrs.value(pname) == "") { -// DEBUG << "PluginXml::setParameters: no parameter \"" << i->name << "\" (attribute \"" << name << "\")" << endl; +// SVDEBUG << "PluginXml::setParameters: no parameter \"" << i->name << "\" (attribute \"" << name << "\")" << endl; continue; } bool ok; float value = attrs.value(pname).trimmed().toFloat(&ok); if (ok) { -// DEBUG << "PluginXml::setParameters: setting parameter \"" +// SVDEBUG << "PluginXml::setParameters: setting parameter \"" // << i->identifier << "\" to value " << value << endl; m_plugin->setParameter(i->identifier, value); } else { @@ -199,7 +199,7 @@ int errorLine; int errorColumn; -// DEBUG << "PluginXml::setParametersFromXml: XML is \"" +// SVDEBUG << "PluginXml::setParametersFromXml: XML is \"" // << xml.toLocal8Bit().data() << "\"" << endl; if (!doc.setContent(xml, false, &error, &errorLine, &errorColumn)) { @@ -217,7 +217,7 @@ for (unsigned int i = 0; i < attrNodes.length(); ++i) { QDomAttr attr = attrNodes.item(i).toAttr(); if (attr.isNull()) continue; -// DEBUG << "PluginXml::setParametersFromXml: Adding attribute \"" << attr.name()// << "\" with value \"" << attr.value() << "\"" << endl; +// SVDEBUG << "PluginXml::setParametersFromXml: Adding attribute \"" << attr.name()// << "\" with value \"" << attr.value() << "\"" << endl; attrs.append(attr.name(), "", "", attr.value()); }
--- a/plugin/RealTimePluginFactory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/RealTimePluginFactory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -44,14 +44,14 @@ { if (pluginType == "ladspa") { if (!_ladspaInstance) { -// DEBUG << "RealTimePluginFactory::instance(" << pluginType// << "): creating new LADSPAPluginFactory" << endl; +// SVDEBUG << "RealTimePluginFactory::instance(" << pluginType// << "): creating new LADSPAPluginFactory" << endl; _ladspaInstance = new LADSPAPluginFactory(); _ladspaInstance->discoverPlugins(); } return _ladspaInstance; } else if (pluginType == "dssi") { if (!_dssiInstance) { -// DEBUG << "RealTimePluginFactory::instance(" << pluginType// << "): creating new DSSIPluginFactory" << endl; +// SVDEBUG << "RealTimePluginFactory::instance(" << pluginType// << "): creating new DSSIPluginFactory" << endl; _dssiInstance = new DSSIPluginFactory(); _dssiInstance->discoverPlugins(); }
--- a/plugin/RealTimePluginInstance.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/RealTimePluginInstance.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -28,10 +28,10 @@ RealTimePluginInstance::~RealTimePluginInstance() { -// DEBUG << "RealTimePluginInstance::~RealTimePluginInstance" << endl; +// SVDEBUG << "RealTimePluginInstance::~RealTimePluginInstance" << endl; if (m_factory) { -// DEBUG << "Asking factory to release " << m_identifier << endl; +// SVDEBUG << "Asking factory to release " << m_identifier << endl; m_factory->releasePlugin(this, m_identifier); }
--- a/plugin/plugins/SamplePlayer.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/plugin/plugins/SamplePlayer.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -152,14 +152,14 @@ SamplePlayer::instantiate(const LADSPA_Descriptor *, unsigned long rate) { if (!hostDescriptor || !hostDescriptor->request_non_rt_thread) { - DEBUG << "SamplePlayer::instantiate: Host does not provide request_non_rt_thread, not instantiating" << endl; + SVDEBUG << "SamplePlayer::instantiate: Host does not provide request_non_rt_thread, not instantiating" << endl; return 0; } SamplePlayer *player = new SamplePlayer(rate); if (hostDescriptor->request_non_rt_thread(player, workThreadCallback)) { - DEBUG << "SamplePlayer::instantiate: Host rejected request_non_rt_thread call, not instantiating" << endl; + SVDEBUG << "SamplePlayer::instantiate: Host rejected request_non_rt_thread call, not instantiating" << endl; delete player; return 0; } @@ -321,7 +321,7 @@ if (player->m_pendingProgramChange >= 0) { #ifdef DEBUG_SAMPLE_PLAYER - DEBUG << "SamplePlayer::workThreadCallback: pending program change " << player->m_pendingProgramChange << endl; + SVDEBUG << "SamplePlayer::workThreadCallback: pending program change " << player->m_pendingProgramChange << endl; #endif player->m_mutex.lock(); @@ -364,7 +364,7 @@ m_samples.clear(); #ifdef DEBUG_SAMPLE_PLAYER - DEBUG << "SamplePlayer::searchSamples: Directory is \"" + SVDEBUG << "SamplePlayer::searchSamples: Directory is \"" << m_sampleDir.toLocal8Bit().data() << "\"" << endl; #endif
--- a/rdf/PluginRDFDescription.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/rdf/PluginRDFDescription.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -305,7 +305,7 @@ } if (results.empty()) { - DEBUG << "ERROR: PluginRDFDescription::indexURL: NOTE: No outputs defined for <" + SVDEBUG << "ERROR: PluginRDFDescription::indexURL: NOTE: No outputs defined for <" << m_pluginUri << ">" << endl; return false; }
--- a/rdf/PluginRDFIndexer.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/rdf/PluginRDFIndexer.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -117,7 +117,7 @@ bool PluginRDFIndexer::indexConfiguredURLs() { - DEBUG << "PluginRDFIndexer::indexConfiguredURLs" << endl; + SVDEBUG << "PluginRDFIndexer::indexConfiguredURLs" << endl; QSettings settings; settings.beginGroup("RDF"); @@ -129,7 +129,7 @@ QString index = indices[i]; - DEBUG << "PluginRDFIndexer::indexConfiguredURLs: index url is " + SVDEBUG << "PluginRDFIndexer::indexConfiguredURLs: index url is " << index << endl; CachedFile cf(index); @@ -143,7 +143,7 @@ PlaylistFileReader::Playlist list = reader.load(); for (PlaylistFileReader::Playlist::const_iterator j = list.begin(); j != list.end(); ++j) { - DEBUG << "PluginRDFIndexer::indexConfiguredURLs: url is " + SVDEBUG << "PluginRDFIndexer::indexConfiguredURLs: url is " << j->toStdString() << endl; pullURL(*j); } @@ -241,7 +241,7 @@ loadPrefixes(); -// DEBUG << "PluginRDFIndexer::indexURL(" << urlString << ")" << endl; +// SVDEBUG << "PluginRDFIndexer::indexURL(" << urlString << ")" << endl; QMutexLocker locker(&m_mutex); @@ -293,7 +293,7 @@ } if (results.empty()) { - DEBUG << "PluginRDFIndexer::reindex: NOTE: no vamp:Plugin resources found in indexed documents" << endl; + SVDEBUG << "PluginRDFIndexer::reindex: NOTE: no vamp:Plugin resources found in indexed documents" << endl; return false; } @@ -308,13 +308,13 @@ QString identifier = (*i)["plugin_id"].value; if (identifier == "") { - DEBUG << "PluginRDFIndexer::reindex: NOTE: No vamp:identifier for plugin <" + SVDEBUG << "PluginRDFIndexer::reindex: NOTE: No vamp:identifier for plugin <" << pluginUri << ">" << endl; continue; } if (soUri == "") { - DEBUG << "PluginRDFIndexer::reindex: NOTE: No implementation library for plugin <" + SVDEBUG << "PluginRDFIndexer::reindex: NOTE: No implementation library for plugin <" << pluginUri << ">" << endl; continue; @@ -334,7 +334,7 @@ SimpleSPARQLQuery::singleResultQuery(m, sonameQuery, "library_id"); QString soname = sonameValue.value; if (soname == "") { - DEBUG << "PluginRDFIndexer::reindex: NOTE: No identifier for library <" + SVDEBUG << "PluginRDFIndexer::reindex: NOTE: No identifier for library <" << soUri << ">" << endl; continue; @@ -355,7 +355,7 @@ if (pluginUri != "") { if (m_uriToIdMap.find(pluginUri) != m_uriToIdMap.end()) { - DEBUG << "PluginRDFIndexer::reindex: WARNING: Found multiple plugins with the same URI:" << endl; + SVDEBUG << "PluginRDFIndexer::reindex: WARNING: Found multiple plugins with the same URI:" << endl; cerr << " 1. Plugin id \"" << m_uriToIdMap[pluginUri] << "\"" << endl; cerr << " 2. Plugin id \"" << pluginId << "\"" << endl; cerr << "both claim URI <" << pluginUri << ">" << endl; @@ -366,7 +366,7 @@ } if (!foundSomething) { - DEBUG << "PluginRDFIndexer::reindex: NOTE: Plugins found, but none sufficiently described" << endl; + SVDEBUG << "PluginRDFIndexer::reindex: NOTE: Plugins found, but none sufficiently described" << endl; } return addedSomething;
--- a/rdf/RDFFeatureWriter.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/rdf/RDFFeatureWriter.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -141,10 +141,10 @@ m_rdfDescriptions[pluginId] = PluginRDFDescription(pluginId); if (m_rdfDescriptions[pluginId].haveDescription()) { - DEBUG << "NOTE: Have RDF description for plugin ID \"" + SVDEBUG << "NOTE: Have RDF description for plugin ID \"" << pluginId << "\"" << endl; } else { - DEBUG << "NOTE: No RDF description for plugin ID \"" + SVDEBUG << "NOTE: No RDF description for plugin ID \"" << pluginId << "\"" << endl; if (!m_network) { cerr << " Consider using the --rdf-network option to retrieve plugin descriptions" << endl; @@ -292,7 +292,7 @@ RDFFeatureWriter::writeSignalDescription(QTextStream *sptr, QString trackId) { -// DEBUG << "RDFFeatureWriter::writeSignalDescription" << endl; +// SVDEBUG << "RDFFeatureWriter::writeSignalDescription" << endl; QTextStream &stream = *sptr; @@ -520,7 +520,7 @@ PluginRDFDescription &desc, QString timelineURI) { -// DEBUG << "RDFFeatureWriter::writeSparseRDF: have " << featureList.size() << " features" << endl; +// SVDEBUG << "RDFFeatureWriter::writeSparseRDF: have " << featureList.size() << " features" << endl; if (featureList.empty()) return; QTextStream &stream = *sptr; @@ -621,7 +621,7 @@ QString featureUri = desc.getOutputFeatureAttributeURI(outputId); if (featureUri == "") { - DEBUG << "RDFFeatureWriter::writeTrackLevelRDF: ERROR: No feature URI available -- this function should not have been called!" << endl; + SVDEBUG << "RDFFeatureWriter::writeTrackLevelRDF: ERROR: No feature URI available -- this function should not have been called!" << endl; return; } @@ -765,14 +765,14 @@ void RDFFeatureWriter::finish() { -// DEBUG << "RDFFeatureWriter::finish()" << endl; +// SVDEBUG << "RDFFeatureWriter::finish()" << endl; // close any open dense feature literals for (map<StringTransformPair, StreamBuffer>::iterator i = m_openDenseFeatures.begin(); i != m_openDenseFeatures.end(); ++i) { -// DEBUG << "closing a stream" << endl; +// SVDEBUG << "closing a stream" << endl; StreamBuffer &b = i->second; *(b.first) << b.second << "\" ." << endl; }
--- a/rdf/RDFImporter.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/rdf/RDFImporter.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -219,11 +219,11 @@ QString signal = results[i]["signal"].value; QString source = results[i]["source"].value; - DEBUG << "NOTE: Seeking signal source \"" << source << "\"..." << endl; + SVDEBUG << "NOTE: Seeking signal source \"" << source << "\"..." << endl; FileSource *fs = new FileSource(source, reporter); if (fs->isAvailable()) { - DEBUG << "NOTE: Source is available: Local filename is \"" + SVDEBUG << "NOTE: Source is available: Local filename is \"" << fs->getLocalFilename() << "\"..." << endl; } @@ -235,7 +235,7 @@ } #else if (!fs->isAvailable()) { - DEBUG << "NOTE: Signal source \"" << source << "\" is not available, using file finder..." << endl; + SVDEBUG << "NOTE: Signal source \"" << source << "\" is not available, using file finder..." << endl; FileFinder *ff = FileFinder::getInstance(); if (ff) { QString path = ff->find(FileFinder::AudioFile, @@ -425,7 +425,7 @@ "title"); if (v.value != "") { - DEBUG << "RDFImporterImpl::getDenseModelTitle: Title (from signal) \"" << v.value << "\"" << endl; + SVDEBUG << "RDFImporterImpl::getDenseModelTitle: Title (from signal) \"" << v.value << "\"" << endl; m->setObjectName(v.value); return; } @@ -436,12 +436,12 @@ "title"); if (v.value != "") { - DEBUG << "RDFImporterImpl::getDenseModelTitle: Title (from signal type) \"" << v.value << "\"" << endl; + SVDEBUG << "RDFImporterImpl::getDenseModelTitle: Title (from signal type) \"" << v.value << "\"" << endl; m->setObjectName(v.value); return; } - DEBUG << "RDFImporterImpl::getDenseModelTitle: No title available for feature <" << featureUri << ">" << endl; + SVDEBUG << "RDFImporterImpl::getDenseModelTitle: No title available for feature <" << featureUri << ">" << endl; } void @@ -741,7 +741,7 @@ } else { QString timestring = SimpleSPARQLQuery::singleResultQuery (s, timeQueryString.arg(thinguri), "time").value; -// DEBUG << "timestring = " << timestring << endl; +// SVDEBUG << "timestring = " << timestring << endl; if (timestring != "") { time = RealTime::fromXsdDuration(timestring.toStdString()); haveTime = true; @@ -770,7 +770,7 @@ modelMap[timeline][type][dimensions].end()) { /* - DEBUG << "Creating new model: source = " << source << ", type = " << type << ", dimensions = " + SVDEBUG << "Creating new model: source = " << source << ", type = " << type << ", dimensions = " << dimensions << ", haveDuration = " << haveDuration << ", time = " << time << ", duration = " << duration << endl; @@ -874,7 +874,7 @@ std::vector<float> &values, QString label) { -// DEBUG << "RDFImporterImpl::fillModel: adding point at frame " << ftime << endl; +// SVDEBUG << "RDFImporterImpl::fillModel: adding point at frame " << ftime << endl; SparseOneDimensionalModel *sodm = dynamic_cast<SparseOneDimensionalModel *>(model); @@ -1026,7 +1026,7 @@ } } - DEBUG << "NOTE: RDFImporter::identifyDocumentType: haveAudio = " + SVDEBUG << "NOTE: RDFImporter::identifyDocumentType: haveAudio = " << haveAudio << endl; value = @@ -1060,7 +1060,7 @@ } } - DEBUG << "NOTE: RDFImporter::identifyDocumentType: haveAnnotations = " + SVDEBUG << "NOTE: RDFImporter::identifyDocumentType: haveAnnotations = " << haveAnnotations << endl; SimpleSPARQLQuery::closeSingleSource(url);
--- a/rdf/RDFTransformFactory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/rdf/RDFTransformFactory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -168,7 +168,7 @@ m_isRDF = true; if (transformResults.empty()) { - DEBUG << "RDFTransformFactory: NOTE: No RDF/TTL transform descriptions found in document at <" << m_urlString << ">" << endl; + SVDEBUG << "RDFTransformFactory: NOTE: No RDF/TTL transform descriptions found in document at <" << m_urlString << ">" << endl; return transforms; } @@ -290,7 +290,7 @@ } } - DEBUG << "RDFTransformFactory: NOTE: Transform is: " << endl; + SVDEBUG << "RDFTransformFactory: NOTE: Transform is: " << endl; cerr << transform.toXmlString() << endl; transforms.push_back(transform);
--- a/rdf/SimpleSPARQLQuery.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/rdf/SimpleSPARQLQuery.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -178,17 +178,17 @@ WredlandWorldWrapper::freeModel(QString forUri) { #ifdef DEBUG_SIMPLE_SPARQL_QUERY - DEBUG << "SimpleSPARQLQuery::freeModel: Model uri = \"" << forUri << "\"" << endl; + SVDEBUG << "SimpleSPARQLQuery::freeModel: Model uri = \"" << forUri << "\"" << endl; #endif QMutexLocker locker(&m_mutex); if (forUri == "") { - DEBUG << "SimpleSPARQLQuery::freeModel: ERROR: Can't free default model" << endl; + SVDEBUG << "SimpleSPARQLQuery::freeModel: ERROR: Can't free default model" << endl; return; } if (m_ownModelUris.find(forUri) == m_ownModelUris.end()) { #ifdef DEBUG_SIMPLE_SPARQL_QUERY - DEBUG << "SimpleSPARQLQuery::freeModel: NOTE: Unknown or already-freed model (uri = \"" << forUri << "\")" << endl; + SVDEBUG << "SimpleSPARQLQuery::freeModel: NOTE: Unknown or already-freed model (uri = \"" << forUri << "\")" << endl; #endif return; } @@ -388,7 +388,7 @@ SimpleSPARQLQuery::Impl::executeDirectParser() { #ifdef DEBUG_SIMPLE_SPARQL_QUERY - DEBUG << "SimpleSPARQLQuery::executeDirectParser: Query is: \"" << m_query << "\"" << endl; + SVDEBUG << "SimpleSPARQLQuery::executeDirectParser: Query is: \"" << m_query << "\"" << endl; #endif ResultList list; @@ -399,12 +399,12 @@ QString fromUri; if (fromRE.indexIn(m_query) < 0) { - DEBUG << "SimpleSPARQLQuery::executeDirectParser: Query contains no FROM clause, nothing to parse from" << endl; + SVDEBUG << "SimpleSPARQLQuery::executeDirectParser: Query contains no FROM clause, nothing to parse from" << endl; return list; } else { fromUri = fromRE.cap(1); #ifdef DEBUG_SIMPLE_SPARQL_QUERY - DEBUG << "SimpleSPARQLQuery::executeDirectParser: FROM URI is <" + SVDEBUG << "SimpleSPARQLQuery::executeDirectParser: FROM URI is <" << fromUri << ">" << endl; #endif } @@ -416,7 +416,7 @@ SimpleSPARQLQuery::Impl::executeDatastore() { #ifdef DEBUG_SIMPLE_SPARQL_QUERY - DEBUG << "SimpleSPARQLQuery::executeDatastore: Query is: \"" << m_query << "\"" << endl; + SVDEBUG << "SimpleSPARQLQuery::executeDatastore: Query is: \"" << m_query << "\"" << endl; #endif ResultList list; @@ -576,7 +576,7 @@ librdf_free_query(query); #ifdef DEBUG_SIMPLE_SPARQL_QUERY - DEBUG << "SimpleSPARQLQuery::executeDatastore: All results retrieved (" << resultCount << " of them)" << endl; + SVDEBUG << "SimpleSPARQLQuery::executeDatastore: All results retrieved (" << resultCount << " of them)" << endl; #endif return list; @@ -620,7 +620,7 @@ SimpleSPARQLQuery q(type, query); ResultList results = q.execute(); if (!q.isOK()) { - DEBUG << "SimpleSPARQLQuery::singleResultQuery: ERROR: " + SVDEBUG << "SimpleSPARQLQuery::singleResultQuery: ERROR: " << q.getErrorString() << endl; return Value(); }
--- a/transform/CSVFeatureWriter.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/transform/CSVFeatureWriter.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -64,7 +64,7 @@ { FileFeatureWriter::setParameters(params); - DEBUG << "CSVFeatureWriter::setParameters" << endl; + SVDEBUG << "CSVFeatureWriter::setParameters" << endl; for (map<string, string>::iterator i = params.begin(); i != params.end(); ++i) { cerr << i->first << " -> " << i->second << endl;
--- a/transform/FeatureExtractionModelTransformer.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/transform/FeatureExtractionModelTransformer.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -43,7 +43,7 @@ m_descriptor(0), m_outputFeatureNo(0) { -// DEBUG << "FeatureExtractionModelTransformer::FeatureExtractionModelTransformer: plugin " << pluginId << ", outputName " << m_transform.getOutput() << endl; +// SVDEBUG << "FeatureExtractionModelTransformer::FeatureExtractionModelTransformer: plugin " << pluginId << ", outputName " << m_transform.getOutput() << endl; QString pluginId = transform.getPluginIdentifier(); @@ -86,7 +86,7 @@ return; } - DEBUG << "Initialising feature extraction plugin with channels = " + SVDEBUG << "Initialising feature extraction plugin with channels = " << channelCount << ", step = " << m_transform.getStepSize() << ", block = " << m_transform.getBlockSize() << endl; @@ -152,7 +152,7 @@ } for (size_t i = 0; i < outputs.size(); ++i) { -// DEBUG << "comparing output " << i << " name \"" << outputs[i].identifier << "\" with expected \"" << m_transform.getOutput() << "\"" << endl; +// SVDEBUG << "comparing output " << i << " name \"" << outputs[i].identifier << "\" with expected \"" << m_transform.getOutput() << "\"" << endl; if (m_transform.getOutput() == "" || outputs[i].identifier == m_transform.getOutput().toStdString()) { m_outputFeatureNo = i; @@ -378,7 +378,7 @@ FeatureExtractionModelTransformer::~FeatureExtractionModelTransformer() { -// DEBUG << "FeatureExtractionModelTransformer::~FeatureExtractionModelTransformer()" << endl; +// SVDEBUG << "FeatureExtractionModelTransformer::~FeatureExtractionModelTransformer()" << endl; delete m_plugin; delete m_descriptor; } @@ -386,12 +386,12 @@ DenseTimeValueModel * FeatureExtractionModelTransformer::getConformingInput() { -// DEBUG << "FeatureExtractionModelTransformer::getConformingInput: input model is " << getInputModel() << endl; +// SVDEBUG << "FeatureExtractionModelTransformer::getConformingInput: input model is " << getInputModel() << endl; DenseTimeValueModel *dtvm = dynamic_cast<DenseTimeValueModel *>(getInputModel()); if (!dtvm) { - DEBUG << "FeatureExtractionModelTransformer::getConformingInput: WARNING: Input model is not conformable to DenseTimeValueModel" << endl; + SVDEBUG << "FeatureExtractionModelTransformer::getConformingInput: WARNING: Input model is not conformable to DenseTimeValueModel" << endl; } return dtvm; } @@ -405,7 +405,7 @@ if (!m_output) return; while (!input->isReady() && !m_abandoned) { - DEBUG << "FeatureExtractionModelTransformer::run: Waiting for input model to be ready..." << endl; + SVDEBUG << "FeatureExtractionModelTransformer::run: Waiting for input model to be ready..." << endl; usleep(500000); } if (m_abandoned) return; @@ -499,7 +499,7 @@ contextStart + contextDuration) break; } -// DEBUG << "FeatureExtractionModelTransformer::run: blockFrame " +// SVDEBUG << "FeatureExtractionModelTransformer::run: blockFrame " // << blockFrame << ", endFrame " << endFrame << ", blockSize " // << blockSize << endl; @@ -636,7 +636,7 @@ { size_t inputRate = m_input.getModel()->getSampleRate(); -// DEBUG << "FeatureExtractionModelTransformer::addFeature(" +// SVDEBUG << "FeatureExtractionModelTransformer::addFeature(" // << blockFrame << ")" << endl; int binCount = 1; @@ -777,7 +777,7 @@ model->setColumn(frame / model->getResolution(), values); } else { - DEBUG << "FeatureExtractionModelTransformer::addFeature: Unknown output model type!" << endl; + SVDEBUG << "FeatureExtractionModelTransformer::addFeature: Unknown output model type!" << endl; } } @@ -789,7 +789,7 @@ binCount = m_descriptor->binCount; } -// DEBUG << "FeatureExtractionModelTransformer::setCompletion(" +// SVDEBUG << "FeatureExtractionModelTransformer::setCompletion(" // << completion << ")" << endl; if (isOutput<SparseOneDimensionalModel>()) {
--- a/transform/FileFeatureWriter.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/transform/FileFeatureWriter.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -46,7 +46,7 @@ } else if (m_support & SupportOneFileTotal) { m_singleFileName = QString("output.%1").arg(m_extension); } else { - DEBUG << "FileFeatureWriter::FileFeatureWriter: ERROR: Invalid support specification " << support << endl; + SVDEBUG << "FileFeatureWriter::FileFeatureWriter: ERROR: Invalid support specification " << support << endl; } } } @@ -60,7 +60,7 @@ } while (!m_files.empty()) { if (m_files.begin()->second) { - DEBUG << "FileFeatureWriter::~FileFeatureWriter: NOTE: Closing feature file \"" + SVDEBUG << "FileFeatureWriter::~FileFeatureWriter: NOTE: Closing feature file \"" << m_files.begin()->second->fileName() << "\"" << endl; delete m_files.begin()->second; } @@ -128,7 +128,7 @@ if (m_support & SupportOneFilePerTrackTransform && m_support & SupportOneFilePerTrack) { if (m_singleFileName != "") { - DEBUG << "FileFeatureWriter::setParameters: WARNING: Both one-file and many-files parameters provided, ignoring many-files" << endl; + SVDEBUG << "FileFeatureWriter::setParameters: WARNING: Both one-file and many-files parameters provided, ignoring many-files" << endl; } else { m_manyFiles = true; } @@ -142,7 +142,7 @@ // OneFilePerTrack), so we need to be able to // override it // if (m_manyFiles) { -// DEBUG << "FileFeatureWriter::setParameters: WARNING: Both many-files and one-file parameters provided, ignoring one-file" << endl; +// SVDEBUG << "FileFeatureWriter::setParameters: WARNING: Both many-files and one-file parameters provided, ignoring one-file" << endl; // } else { m_singleFileName = i->second.c_str(); // } @@ -151,7 +151,7 @@ } else if (i->first == "stdout") { if (m_support & SupportOneFileTotal) { if (m_singleFileName != "") { - DEBUG << "FileFeatureWriter::setParameters: WARNING: Both stdout and one-file provided, ignoring stdout" << endl; + SVDEBUG << "FileFeatureWriter::setParameters: WARNING: Both stdout and one-file provided, ignoring stdout" << endl; } else { m_stdout = true; } @@ -171,7 +171,7 @@ if (m_singleFileName != "") { if (QFileInfo(m_singleFileName).exists() && !(m_force || m_append)) { cerr << endl << "FileFeatureWriter: ERROR: Specified output file \"" << m_singleFileName << "\" exists and neither --" << getWriterTag() << "-force nor --" << getWriterTag() << "-append flag is specified -- not overwriting" << endl; - DEBUG << "NOTE: To find out how to fix this problem, read the help for the --" << getWriterTag() << "-force" << endl << "and --" << getWriterTag() << "-append options" << endl; + SVDEBUG << "NOTE: To find out how to fix this problem, read the help for the --" << getWriterTag() << "-force" << endl << "and --" << getWriterTag() << "-append options" << endl; return ""; } return m_singleFileName; @@ -216,7 +216,7 @@ if (QFileInfo(filename).exists() && !(m_force || m_append)) { cerr << endl << "FileFeatureWriter: ERROR: Output file \"" << filename << "\" exists (for input file or URL \"" << trackId << "\" and transform \"" << transformId << "\") and neither --" << getWriterTag() << "-force nor --" << getWriterTag() << "-append is specified -- not overwriting" << endl; - DEBUG << "NOTE: To find out how to fix this problem, read the help for the --" << getWriterTag() << "-force" << endl << "and --" << getWriterTag() << "-append options" << endl; + SVDEBUG << "NOTE: To find out how to fix this problem, read the help for the --" << getWriterTag() << "-force" << endl << "and --" << getWriterTag() << "-append options" << endl; return ""; } @@ -263,11 +263,11 @@ return 0; } - DEBUG << "FileFeatureWriter: NOTE: Using output filename \"" + SVDEBUG << "FileFeatureWriter: NOTE: Using output filename \"" << filename << "\"" << endl; if (m_append) { - DEBUG << "FileFeatureWriter: NOTE: Calling reviewFileForAppending" << endl; + SVDEBUG << "FileFeatureWriter: NOTE: Calling reviewFileForAppending" << endl; reviewFileForAppending(filename); } @@ -329,7 +329,7 @@ void FileFeatureWriter::finish() { -// DEBUG << "FileFeatureWriter::finish()" << endl; +// SVDEBUG << "FileFeatureWriter::finish()" << endl; if (m_singleFileName != "" || m_stdout) return; @@ -340,7 +340,7 @@ } while (!m_files.empty()) { if (m_files.begin()->second) { - DEBUG << "FileFeatureWriter::finish: NOTE: Closing feature file \"" + SVDEBUG << "FileFeatureWriter::finish: NOTE: Closing feature file \"" << m_files.begin()->second->fileName() << "\"" << endl; delete m_files.begin()->second; }
--- a/transform/ModelTransformerFactory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/transform/ModelTransformerFactory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -181,7 +181,7 @@ new RealTimeEffectModelTransformer(input, transform); } else { - DEBUG << "ModelTransformerFactory::createTransformer: Unknown transform \"" + SVDEBUG << "ModelTransformerFactory::createTransformer: Unknown transform \"" << transform.getIdentifier() << "\"" << endl; return transformer; } @@ -195,7 +195,7 @@ const ModelTransformer::Input &input, QString &message) { - DEBUG << "ModelTransformerFactory::transform: Constructing transformer with input model " << input.getModel() << endl; + SVDEBUG << "ModelTransformerFactory::transform: Constructing transformer with input model " << input.getModel() << endl; ModelTransformer *t = createTransformer(transform, input); if (!t) return 0; @@ -236,7 +236,7 @@ QObject *s = sender(); ModelTransformer *transformer = dynamic_cast<ModelTransformer *>(s); -// DEBUG << "ModelTransformerFactory::transformerFinished(" << transformer << ")" << endl; +// SVDEBUG << "ModelTransformerFactory::transformerFinished(" << transformer << ")" << endl; if (!transformer) { std::cerr << "WARNING: ModelTransformerFactory::transformerFinished: sender is not a transformer" << std::endl;
--- a/transform/RealTimeEffectModelTransformer.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/transform/RealTimeEffectModelTransformer.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -43,7 +43,7 @@ if (!m_transform.getBlockSize()) m_transform.setBlockSize(1024); -// DEBUG << "RealTimeEffectModelTransformer::RealTimeEffectModelTransformer: plugin " << pluginId << ", output " << output << endl; +// SVDEBUG << "RealTimeEffectModelTransformer::RealTimeEffectModelTransformer: plugin " << pluginId << ", output " << output << endl; RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(pluginId); @@ -110,7 +110,7 @@ DenseTimeValueModel *dtvm = dynamic_cast<DenseTimeValueModel *>(getInputModel()); if (!dtvm) { - DEBUG << "RealTimeEffectModelTransformer::getConformingInput: WARNING: Input model is not conformable to DenseTimeValueModel" << endl; + SVDEBUG << "RealTimeEffectModelTransformer::getConformingInput: WARNING: Input model is not conformable to DenseTimeValueModel" << endl; } return dtvm; } @@ -122,7 +122,7 @@ if (!input) return; while (!input->isReady() && !m_abandoned) { - DEBUG << "RealTimeEffectModelTransformer::run: Waiting for input model to be ready..." << endl; + SVDEBUG << "RealTimeEffectModelTransformer::run: Waiting for input model to be ready..." << endl; usleep(500000); } if (m_abandoned) return;
--- a/transform/Transform.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/transform/Transform.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -124,7 +124,7 @@ m_duration == t.m_duration && m_sampleRate == t.m_sampleRate; /* - DEBUG << "Transform::operator==: identical = " << identical << endl; + SVDEBUG << "Transform::operator==: identical = " << identical << endl; std::cerr << "A = " << std::endl; std::cerr << toXmlString() << std::endl; std::cerr << "B = " << std::endl; @@ -260,7 +260,7 @@ void Transform::setParameter(QString name, float value) { -// DEBUG << "Transform::setParameter(" << name// << ") -> " << value << endl; +// SVDEBUG << "Transform::setParameter(" << name// << ") -> " << value << endl; m_parameters[name] = value; } @@ -279,7 +279,7 @@ void Transform::setConfigurationValue(QString name, QString value) { - DEBUG << "Transform::setConfigurationValue(" << name << ") -> " << value << endl; + SVDEBUG << "Transform::setConfigurationValue(" << name << ") -> " << value << endl; m_configuration[name] = value; } @@ -461,7 +461,7 @@ str == "standard deviation" || str == "sd") return StandardDeviation; if (str == "count") return Count; if (str == "") return NoSummary; - DEBUG << "Transform::stringToSummaryType: unknown summary type \"" + SVDEBUG << "Transform::stringToSummaryType: unknown summary type \"" << str << "\"" << endl; return NoSummary; } @@ -481,7 +481,7 @@ case Count: return "count"; case NoSummary: return ""; default: - DEBUG << "Transform::summaryTypeToString: unexpected summary type " + SVDEBUG << "Transform::summaryTypeToString: unexpected summary type " << int(type) << endl; return ""; }
--- a/transform/TransformFactory.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/transform/TransformFactory.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -52,7 +52,7 @@ void TransformFactory::deleteInstance() { - DEBUG << "TransformFactory::deleteInstance called" << endl; + SVDEBUG << "TransformFactory::deleteInstance called" << endl; delete m_instance; m_instance = 0; } @@ -70,12 +70,12 @@ m_exiting = true; if (m_thread) { #ifdef DEBUG_TRANSFORM_FACTORY - DEBUG << "TransformFactory::~TransformFactory: waiting on thread" << endl; + SVDEBUG << "TransformFactory::~TransformFactory: waiting on thread" << endl; #endif m_thread->wait(); delete m_thread; #ifdef DEBUG_TRANSFORM_FACTORY - DEBUG << "TransformFactory::~TransformFactory: waited and done" << endl; + SVDEBUG << "TransformFactory::~TransformFactory: waited and done" << endl; #endif } } @@ -113,7 +113,7 @@ for (TransformDescriptionMap::const_iterator i = m_transforms.begin(); i != m_transforms.end(); ++i) { #ifdef DEBUG_TRANSFORM_FACTORY - DEBUG << "inserting transform into set: id = " << i->second.identifier << endl; + SVDEBUG << "inserting transform into set: id = " << i->second.identifier << endl; #endif dset.insert(i->second); } @@ -122,7 +122,7 @@ for (std::set<TransformDescription>::const_iterator i = dset.begin(); i != dset.end(); ++i) { #ifdef DEBUG_TRANSFORM_FACTORY - DEBUG << "inserting transform into list: id = " << i->identifier << endl; + SVDEBUG << "inserting transform into list: id = " << i->identifier << endl; #endif list.push_back(*i); } @@ -159,7 +159,7 @@ for (TransformDescriptionMap::const_iterator i = m_uninstalledTransforms.begin(); i != m_uninstalledTransforms.end(); ++i) { #ifdef DEBUG_TRANSFORM_FACTORY - DEBUG << "inserting transform into set: id = " << i->second.identifier << endl; + SVDEBUG << "inserting transform into set: id = " << i->second.identifier << endl; #endif dset.insert(i->second); } @@ -168,7 +168,7 @@ for (std::set<TransformDescription>::const_iterator i = dset.begin(); i != dset.end(); ++i) { #ifdef DEBUG_TRANSFORM_FACTORY - DEBUG << "inserting transform into uninstalled list: id = " << i->identifier << endl; + SVDEBUG << "inserting transform into uninstalled list: id = " << i->identifier << endl; #endif list.push_back(*i); } @@ -659,7 +659,7 @@ QString name = desc.getPluginName(); #ifdef DEBUG_TRANSFORM_FACTORY if (name == "") { - DEBUG << "TransformFactory::populateUninstalledTransforms: " + SVDEBUG << "TransformFactory::populateUninstalledTransforms: " << "No name available for plugin " << i- << ", skipping" << endl; continue; } @@ -677,7 +677,7 @@ if (m_transforms.find(tid) != m_transforms.end()) { #ifdef DEBUG_TRANSFORM_FACTORY - DEBUG << "TransformFactory::populateUninstalledTransforms: " + SVDEBUG << "TransformFactory::populateUninstalledTransforms: " << tid << " is installed; adding info url if appropriate, skipping rest" << endl; #endif if (infoUrl != "") { @@ -689,7 +689,7 @@ } #ifdef DEBUG_TRANSFORM_FACTORY - DEBUG << "TransformFactory::populateUninstalledTransforms: " + SVDEBUG << "TransformFactory::populateUninstalledTransforms: " << "adding " << tid << endl; #endif @@ -952,7 +952,7 @@ for (Vamp::PluginBase::ParameterList::const_iterator i = parameters.begin(); i != parameters.end(); ++i) { pmap[i->identifier.c_str()] = plugin->getParameter(i->identifier); -// DEBUG << "TransformFactory::setParametersFromPlugin: parameter " +// SVDEBUG << "TransformFactory::setParametersFromPlugin: parameter " // << i->identifier << " -> value " << // pmap[i->identifier.c_str()] << endl; } @@ -1067,7 +1067,7 @@ Vamp::PluginBase *plugin = instantiateDefaultPluginFor (t.getIdentifier(), 0); if (!plugin) { - DEBUG << "TransformFactory::getPluginConfigurationXml: " + SVDEBUG << "TransformFactory::getPluginConfigurationXml: " << "Unable to instantiate plugin for transform \"" << t.getIdentifier() << "\"" << endl; return xml; @@ -1089,7 +1089,7 @@ Vamp::PluginBase *plugin = instantiateDefaultPluginFor (t.getIdentifier(), 0); if (!plugin) { - DEBUG << "TransformFactory::setParametersFromPluginConfigurationXml: " + SVDEBUG << "TransformFactory::setParametersFromPluginConfigurationXml: " << "Unable to instantiate plugin for transform \"" << t.getIdentifier() << "\"" << endl; return; @@ -1145,7 +1145,7 @@ if (!m_uninstalledTransformsMutex.tryLock()) { // uninstalled transforms are being populated; this may take some time, // and they aren't critical, but we will speed them up if necessary - DEBUG << "TransformFactory::search: Uninstalled transforms mutex is held, skipping" << endl; + SVDEBUG << "TransformFactory::search: Uninstalled transforms mutex is held, skipping" << endl; m_populatingSlowly = false; return results; }