Mercurial > hg > svcore
changeset 847:2d53205f70cd tonioni
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 26 Nov 2013 14:37:01 +0000 |
| parents | 226733f3cf3f (current diff) 2010409af203 (diff) |
| children | 539740f231fa c9846844ac11 |
| files | base/PlayParameterRepository.cpp data/fft/FFTDataServer.cpp data/fileio/CoreAudioFileReader.cpp plugin/DSSIPluginInstance.cpp plugin/plugins/SamplePlayer.cpp transform/FeatureExtractionModelTransformer.cpp transform/ModelTransformerFactory.cpp |
| diffstat | 74 files changed, 630 insertions(+), 634 deletions(-) [+] |
line wrap: on
line diff
--- a/base/Debug.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/Debug.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -75,12 +75,12 @@ std::ostream & operator<<(std::ostream &target, const QString &str) { - return target << str.toLocal8Bit().data(); + return target << str.toStdString(); } std::ostream & operator<<(std::ostream &target, const QUrl &u) { - return target << "<" << u.toString() << ">"; + return target << "<" << u.toString().toStdString() << ">"; }
--- a/base/Debug.h Fri Nov 22 10:37:28 2013 +0000 +++ b/base/Debug.h Tue Nov 26 14:37:01 2013 +0000 @@ -18,6 +18,7 @@ #include <QDebug> #include <QTextStream> + #include <string> #include <iostream> @@ -28,6 +29,10 @@ std::ostream &operator<<(std::ostream &, const QString &); std::ostream &operator<<(std::ostream &, const QUrl &); +using std::cout; +using std::cerr; +using std::endl; + #ifndef NDEBUG extern QDebug &getSVDebug();
--- a/base/Exceptions.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/Exceptions.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -17,11 +17,13 @@ #include <iostream> +#include "Debug.h" + FileNotFound::FileNotFound(QString file) throw() : m_file(file) { - std::cerr << "ERROR: File not found: " - << file << std::endl; + cerr << "ERROR: File not found: " + << file << endl; } const char * @@ -34,8 +36,8 @@ FailedToOpenFile::FailedToOpenFile(QString file) throw() : m_file(file) { - std::cerr << "ERROR: Failed to open file: " - << file << std::endl; + cerr << "ERROR: Failed to open file: " + << file << endl; } const char * @@ -48,8 +50,8 @@ DirectoryCreationFailed::DirectoryCreationFailed(QString directory) throw() : m_directory(directory) { - std::cerr << "ERROR: Directory creation failed for directory: " - << directory << std::endl; + cerr << "ERROR: Directory creation failed for directory: " + << directory << endl; } const char * @@ -62,8 +64,8 @@ FileReadFailed::FileReadFailed(QString file) throw() : m_file(file) { - std::cerr << "ERROR: File read failed for file: " - << file << std::endl; + cerr << "ERROR: File read failed for file: " + << file << endl; } const char * @@ -77,8 +79,8 @@ m_file(file), m_operation(op) { - std::cerr << "ERROR: File " << op << " failed for file: " - << file << std::endl; + cerr << "ERROR: File " << op << " failed for file: " + << file << endl; } const char * @@ -95,9 +97,9 @@ m_required(required), m_available(available) { - std::cerr << "ERROR: Not enough disc space available in " + cerr << "ERROR: Not enough disc space available in " << directory << ": need " << required - << ", only have " << available << std::endl; + << ", only have " << available << endl; } InsufficientDiscSpace::InsufficientDiscSpace(QString directory) throw() : @@ -105,8 +107,8 @@ m_required(0), m_available(0) { - std::cerr << "ERROR: Not enough disc space available in " - << directory << std::endl; + cerr << "ERROR: Not enough disc space available in " + << directory << endl; } const char * @@ -124,8 +126,8 @@ AllocationFailed::AllocationFailed(QString purpose) throw() : m_purpose(purpose) { - std::cerr << "ERROR: Allocation failed: " << purpose.toStdString() - << std::endl; + cerr << "ERROR: Allocation failed: " << purpose + << endl; } const char *
--- a/base/PlayParameterRepository.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/PlayParameterRepository.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -35,14 +35,14 @@ void PlayParameterRepository::addPlayable(const Playable *playable) { - std::cerr << "PlayParameterRepository:addPlayable playable = " << playable << std::endl; + cerr << "PlayParameterRepository:addPlayable playable = " << playable << endl; if (!getPlayParameters(playable)) { // Give all playables the same type of play parameters for the // moment - std::cerr << "PlayParameterRepository:addPlayable: Adding play parameters for " << playable << std::endl; + cerr << "PlayParameterRepository:addPlayable: Adding play parameters for " << playable << endl; PlayParameters *params = new PlayParameters; m_playParameters[playable] = params; @@ -62,9 +62,8 @@ connect(params, SIGNAL(playPluginConfigurationChanged(QString)), this, SLOT(playPluginConfigurationChanged(QString))); - std::cerr << "Connected play parameters " << params << " for playable " - << playable << " to this " << this << std::endl; - + cerr << "Connected play parameters " << params << " for playable " + << playable << " to this " << this << endl; } } @@ -72,7 +71,7 @@ PlayParameterRepository::removePlayable(const Playable *playable) { if (m_playParameters.find(playable) == m_playParameters.end()) { - std::cerr << "WARNING: PlayParameterRepository::removePlayable: unknown playable " << playable << std::endl; + cerr << "WARNING: PlayParameterRepository::removePlayable: unknown playable " << playable << endl; return; } delete m_playParameters[playable]; @@ -83,11 +82,11 @@ PlayParameterRepository::copyParameters(const Playable *from, const Playable *to) { if (!getPlayParameters(from)) { - std::cerr << "ERROR: PlayParameterRepository::copyParameters: source playable unknown" << std::endl; + cerr << "ERROR: PlayParameterRepository::copyParameters: source playable unknown" << endl; return; } if (!getPlayParameters(to)) { - std::cerr << "WARNING: PlayParameterRepository::copyParameters: target playable unknown, adding it now" << std::endl; + cerr << "WARNING: PlayParameterRepository::copyParameters: target playable unknown, adding it now" << endl; addPlayable(to); } getPlayParameters(to)->copyFrom(getPlayParameters(from)); @@ -137,7 +136,7 @@ void PlayParameterRepository::clear() { -// std::cerr << "PlayParameterRepository: PlayParameterRepository::clear" << std::endl; +// cerr << "PlayParameterRepository: PlayParameterRepository::clear" << endl; while (!m_playParameters.empty()) { delete m_playParameters.begin()->second; m_playParameters.erase(m_playParameters.begin());
--- a/base/PlayParameters.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/PlayParameters.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -81,7 +81,7 @@ void PlayParameters::setPlayMuted(bool muted) { -// std::cerr << "PlayParameters: setPlayMuted(" << muted << ")" << std::endl; +// cerr << "PlayParameters: setPlayMuted(" << muted << ")" << endl; if (m_playMuted != muted) { m_playMuted = muted; emit playMutedChanged(muted); @@ -93,7 +93,7 @@ void PlayParameters::setPlayAudible(bool audible) { -// std::cerr << "PlayParameters(" << this << "): setPlayAudible(" << audible << ")" << std::endl; +// cerr << "PlayParameters(" << this << "): setPlayAudible(" << audible << ")" << endl; setPlayMuted(!audible); } @@ -132,7 +132,7 @@ { if (m_playPluginConfiguration != configuration) { m_playPluginConfiguration = configuration; -// std::cerr << "PlayParameters(" << this << "): setPlayPluginConfiguration to \"" << configuration << "\"" << std::endl; +// cerr << "PlayParameters(" << this << "): setPlayPluginConfiguration to \"" << configuration << "\"" << endl; emit playPluginConfigurationChanged(configuration); emit playParametersChanged(); }
--- a/base/Profiler.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/Profiler.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -29,9 +29,6 @@ #include <set> #include <map> -using std::cerr; -using std::endl; - Profiles* Profiles::m_instance = 0; Profiles* Profiles::getInstance()
--- a/base/ProgressPrinter.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/ProgressPrinter.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -17,6 +17,8 @@ #include <iostream> +#include "Debug.h" + ProgressPrinter::ProgressPrinter(QString message, QObject *parent) : ProgressReporter(parent), m_prefix(message), @@ -31,9 +33,9 @@ ProgressPrinter::~ProgressPrinter() { if (m_lastProgress > 0 && m_lastProgress != 100) { - std::cerr << "\r\n"; + cerr << "\r\n"; } -// std::cerr << "(progress printer dtor)" << std::endl; +// cerr << "(progress printer dtor)" << endl; } bool @@ -60,23 +62,23 @@ void ProgressPrinter::done() { - std::cerr << "\r" - << m_prefix.toStdString() + cerr << "\r" + << m_prefix << (m_prefix == "" ? "" : " ") - << "Done" << std::endl; + << "Done" << endl; } void ProgressPrinter::setProgress(int progress) { if (progress == m_lastProgress) return; - std::cerr << "\r" - << m_prefix.toStdString() + cerr << "\r" + << m_prefix << (m_prefix == "" ? "" : " "); if (m_definite) { - std::cerr << progress << "%"; + cerr << progress << "%"; } else { - std::cerr << "|/-\\"[progress % 4]; + cerr << "|/-\\"[progress % 4]; } m_lastProgress = progress; }
--- a/base/PropertyContainer.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/PropertyContainer.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -68,7 +68,7 @@ void PropertyContainer::setProperty(const PropertyName &name, int) { - std::cerr << "WARNING: PropertyContainer[" << getPropertyContainerName() << "]::setProperty(" << name << "): no implementation in subclass!" << std::endl; + cerr << "WARNING: PropertyContainer[" << getPropertyContainerName() << "]::setProperty(" << name << "): no implementation in subclass!" << endl; } Command * @@ -85,10 +85,10 @@ PropertyName name; int value; if (!convertPropertyStrings(nameString, valueString, name, value)) { - std::cerr << "WARNING: PropertyContainer::setProperty(\"" + cerr << "WARNING: PropertyContainer::setProperty(\"" << nameString << "\", \"" - << valueString.toStdString() - << "\"): Name and value conversion failed" << std::endl; + << valueString + << "\"): Name and value conversion failed" << endl; return; } setProperty(name, value); @@ -100,10 +100,10 @@ PropertyName name; int value; if (!convertPropertyStrings(nameString, valueString, name, value)) { - std::cerr << "WARNING: PropertyContainer::getSetPropertyCommand(\"" + cerr << "WARNING: PropertyContainer::getSetPropertyCommand(\"" << nameString << "\", \"" - << valueString.toStdString() - << "\"): Name and value conversion failed" << std::endl; + << valueString + << "\"): Name and value conversion failed" << endl; return 0; } return getSetPropertyCommand(name, value); @@ -135,7 +135,7 @@ } if (name == "") { - std::cerr << "PropertyContainer::convertPropertyStrings: Unable to match name string \"" << nameString << "\"" << std::endl; + cerr << "PropertyContainer::convertPropertyStrings: Unable to match name string \"" << nameString << "\"" << endl; return false; } @@ -204,7 +204,7 @@ bool ok = false; int i = valueString.toInt(&ok); if (!ok) { - std::cerr << "PropertyContainer::convertPropertyStrings: Unable to parse value string \"" << valueString << "\"" << std::endl; + cerr << "PropertyContainer::convertPropertyStrings: Unable to parse value string \"" << valueString << "\"" << endl; return false; } else if (i < min || i > max) { SVDEBUG << "PropertyContainer::convertPropertyStrings: Property value \"" << i << "\" outside valid range " << min << " to " << max << endl;
--- a/base/RangeMapper.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/RangeMapper.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -73,10 +73,10 @@ { convertMinMax(minpos, maxpos, minval, maxval, m_minlog, m_ratio); - std::cerr << "LogRangeMapper: minpos " << minpos << ", maxpos " + cerr << "LogRangeMapper: minpos " << minpos << ", maxpos " << maxpos << ", minval " << minval << ", maxval " << maxval << ", minlog " << m_minlog << ", ratio " << m_ratio - << ", unit " << unit << std::endl; + << ", unit " << unit << endl; assert(m_maxpos != m_minpos);
--- a/base/RealTime.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/RealTime.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -23,12 +23,11 @@ #include <cstdlib> #include <sstream> -using std::cerr; -using std::endl; - #include "RealTime.h" #include "sys/time.h" +#include "Debug.h" + #include "Preferences.h" // A RealTime consists of two ints that must be at least 32 bits each. @@ -129,12 +128,12 @@ } if (year > 0) { - std::cerr << "WARNING: This xsd:duration (\"" << xsdd << "\") contains a non-zero year.\nWith no origin and a limited data size, I will treat a year as exactly 31556952\nseconds and you should expect overflow and/or poor results." << std::endl; + cerr << "WARNING: This xsd:duration (\"" << xsdd << "\") contains a non-zero year.\nWith no origin and a limited data size, I will treat a year as exactly 31556952\nseconds and you should expect overflow and/or poor results." << endl; t = t + RealTime(year * 31556952, 0); } if (month > 0) { - std::cerr << "WARNING: This xsd:duration (\"" << xsdd << "\") contains a non-zero month.\nWith no origin and a limited data size, I will treat a month as exactly 2629746\nseconds and you should expect overflow and/or poor results." << std::endl; + cerr << "WARNING: This xsd:duration (\"" << xsdd << "\") contains a non-zero month.\nWith no origin and a limited data size, I will treat a month as exactly 2629746\nseconds and you should expect overflow and/or poor results." << endl; t = t + RealTime(month * 2629746, 0); } @@ -341,7 +340,7 @@ out << ":"; -// std::cerr << "div = " << div << ", f = "<< f << std::endl; +// cerr << "div = " << div << ", f = "<< f << endl; while (div) { int d = (f / div) % 10; @@ -351,7 +350,7 @@ std::string s = out.str(); -// std::cerr << "converted " << toString() << " to " << s << std::endl; +// cerr << "converted " << toString() << " to " << s << endl; return s; }
--- a/base/Resampler.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/Resampler.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -26,6 +26,8 @@ #include <samplerate.h> +#include "Debug.h" + class Resampler::D { public: @@ -144,7 +146,7 @@ //!!! check err, respond appropriately if (data.input_frames_used != incount) { - std::cerr << "Resampler: NOTE: input_frames_used == " << data.input_frames_used << " (while incount = " << incount << ")" << std::endl; + cerr << "Resampler: NOTE: input_frames_used == " << data.input_frames_used << " (while incount = " << incount << ")" << endl; } return data.output_frames_gen;
--- a/base/ResourceFinder.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/ResourceFinder.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -155,7 +155,7 @@ QString path = QString("%1%2/%3").arg(prefix).arg(resourceCat).arg(fileName); if (QFileInfo(path).exists() && QFileInfo(path).isReadable()) { - std::cerr << "Found it!" << std::endl; + cerr << "Found it!" << endl; return path; } } @@ -209,7 +209,7 @@ QDir userDir(user); if (!userDir.exists()) { if (!userDir.mkpath(user)) { - std::cerr << "ResourceFinder::getResourceSaveDir: ERROR: Failed to create user resource path \"" << user << "\"" << std::endl; + cerr << "ResourceFinder::getResourceSaveDir: ERROR: Failed to create user resource path \"" << user << "\"" << endl; return ""; } } @@ -219,7 +219,7 @@ QDir saveDir(save); if (!saveDir.exists()) { if (!userDir.mkpath(save)) { - std::cerr << "ResourceFinder::getResourceSaveDir: ERROR: Failed to create user resource path \"" << save << "\"" << std::endl; + cerr << "ResourceFinder::getResourceSaveDir: ERROR: Failed to create user resource path \"" << save << "\"" << endl; return ""; } } @@ -280,7 +280,7 @@ QString target = getResourceSavePath(resourceCat, fileName); QFile file(path); if (!file.copy(target)) { - std::cerr << "ResourceFinder::unbundleResource: ERROR: Failed to un-bundle resource file \"" << fileName << "\" to user location \"" << target << "\"" << std::endl; + cerr << "ResourceFinder::unbundleResource: ERROR: Failed to un-bundle resource file \"" << fileName << "\" to user location \"" << target << "\"" << endl; return false; }
--- a/base/StorageAdviser.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/StorageAdviser.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -49,7 +49,7 @@ try { path = TempDirectory::getInstance()->getPath(); } catch (std::exception e) { - std::cerr << "StorageAdviser::recommend: ERROR: Failed to get temporary directory path: " << e.what() << std::endl; + cerr << "StorageAdviser::recommend: ERROR: Failed to get temporary directory path: " << e.what() << endl; return Recommendation(UseMemory | ConserveSpace); } int discFree = GetDiscSpaceMBAvailable(path.toLocal8Bit()); @@ -69,7 +69,7 @@ } #ifdef DEBUG_STORAGE_ADVISER - std::cerr << "Disc space: " << discFree << ", memory free: " << memoryFree << ", memory total: " << memoryTotal << ", min " << minimumSize << ", max " << maximumSize << std::endl; + cerr << "Disc space: " << discFree << ", memory free: " << memoryFree << ", memory total: " << memoryTotal << ", min " << minimumSize << ", max " << maximumSize << endl; #endif //!!! We have a potentially serious problem here if multiple @@ -106,8 +106,8 @@ else discStatus = Sufficient; #ifdef DEBUG_STORAGE_ADVISER - std::cerr << "Memory status: " << memoryStatus << ", disc status " - << discStatus << std::endl; + cerr << "Memory status: " << memoryStatus << ", disc status " + << discStatus << endl; #endif int recommendation = NoRecommendation; @@ -189,8 +189,8 @@ { if (area == MemoryAllocation) m_memoryPlanned += size; else if (area == DiscAllocation) m_discPlanned += size; -// std::cerr << "storage planned up: memory: " << m_memoryPlanned << ", disc " -// << m_discPlanned << std::endl; +// cerr << "storage planned up: memory: " << m_memoryPlanned << ", disc " +// << m_discPlanned << endl; } void @@ -203,8 +203,8 @@ if (m_discPlanned > size) m_discPlanned -= size; else m_discPlanned = 0; } -// std::cerr << "storage planned down: memory: " << m_memoryPlanned << ", disc " -// << m_discPlanned << std::endl; +// cerr << "storage planned down: memory: " << m_memoryPlanned << ", disc " +// << m_discPlanned << endl; } void
--- a/base/StringBits.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/StringBits.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -144,7 +144,7 @@ QStringList l = splitQuoted(tests[j], ' '); for (int i = 0; i < l.size(); ++i) { if (i > 0) cout << ";"; - cout << l[i].toStdString(); + cout << l[i]; } cout << ")" << endl; }
--- a/base/TempDirectory.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/TempDirectory.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -206,10 +206,10 @@ cleanupDirectory(fi.absoluteFilePath()); } else { if (!QFile(fi.absoluteFilePath()).remove()) { - std::cerr << "WARNING: TempDirectory::cleanup: " + cerr << "WARNING: TempDirectory::cleanup: " << "Failed to unlink file \"" << fi.absoluteFilePath() << "\"" - << std::endl; + << endl; } } } @@ -217,15 +217,15 @@ QString dirname = dir.dirName(); if (dirname != "") { if (!dir.cdUp()) { - std::cerr << "WARNING: TempDirectory::cleanup: " + cerr << "WARNING: TempDirectory::cleanup: " << "Failed to cd to parent directory of " - << tmpdir << std::endl; + << tmpdir << endl; return; } if (!dir.rmdir(dirname)) { - std::cerr << "WARNING: TempDirectory::cleanup: " + cerr << "WARNING: TempDirectory::cleanup: " << "Failed to remove directory " - << dirname << std::endl; + << dirname << endl; } } @@ -247,10 +247,10 @@ QDir subdir(dirpath, "*.pid", QDir::Name, QDir::Files); if (subdir.count() == 0) { - std::cerr << "INFO: Found temporary directory with no .pid file in it!\n(directory=\"" - << dirpath << "\"). Removing it..." << std::endl; + cerr << "INFO: Found temporary directory with no .pid file in it!\n(directory=\"" + << dirpath << "\"). Removing it..." << endl; cleanupDirectory(dirpath); - std::cerr << "...done." << std::endl; + cerr << "...done." << endl; continue; } @@ -261,13 +261,13 @@ if (!ok) continue; if (GetProcessStatus(pid) == ProcessNotRunning) { - std::cerr << "INFO: Found abandoned temporary directory from " + cerr << "INFO: Found abandoned temporary directory from " << "a previous, defunct process\n(pid=" << pid << ", directory=\"" - << dirpath.toStdString() - << "\"). Removing it..." << std::endl; + << dirpath + << "\"). Removing it..." << endl; cleanupDirectory(dirpath); - std::cerr << "...done." << std::endl; + cerr << "...done." << endl; break; } }
--- a/base/TempWriteFile.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/TempWriteFile.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -27,7 +27,7 @@ temp.setAutoRemove(false); temp.open(); // creates the file and opens it atomically if (temp.error()) { - std::cerr << "TempWriteFile: Failed to create temporary file in directory of " << m_target << ": " << temp.errorString() << std::endl; + cerr << "TempWriteFile: Failed to create temporary file in directory of " << m_target << ": " << temp.errorString() << endl; throw FileOperationFailed(temp.fileName(), "creation"); } @@ -60,7 +60,7 @@ // Therefore, delete first the existing file. if (dir.exists(m_target)) dir.remove(m_target); if (!dir.rename(m_temp, m_target)) { - std::cerr << "TempWriteFile: Failed to rename temporary file " << m_temp << " to target " << m_target << std::endl; + cerr << "TempWriteFile: Failed to rename temporary file " << m_temp << " to target " << m_target << endl; throw FileOperationFailed(m_temp, "rename"); }
--- a/base/Thread.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/base/Thread.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -63,7 +63,7 @@ m_locker(mutex) { #ifdef DEBUG_MUTEX_LOCKER - std::cerr << "... locked mutex " << mutex << std::endl; + cerr << "... locked mutex " << mutex << endl; #endif m_profiler.end(); } @@ -76,16 +76,16 @@ m_name(name) { #ifdef DEBUG_MUTEX_LOCKER - std::cerr << "MutexLocker: Locking \"" << m_name << "\" in " - << (void *)QThread::currentThreadId() << std::endl; + cerr << "MutexLocker: Locking \"" << m_name << "\" in " + << (void *)QThread::currentThreadId() << endl; #endif } MutexLocker::Printer::~Printer() { #ifdef DEBUG_MUTEX_LOCKER - std::cerr << "MutexLocker: Unlocking \"" << m_name - << "\" in " << (void *)QThread::currentThreadId() << std::endl; + cerr << "MutexLocker: Unlocking \"" << m_name + << "\" in " << (void *)QThread::currentThreadId() << endl; #endif }
--- a/data/fft/FFTDataServer.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fft/FFTDataServer.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -292,8 +292,8 @@ } } - std::cerr << "ERROR: FFTDataServer::claimInstance: instance " - << server << " unknown!" << std::endl; + cerr << "ERROR: FFTDataServer::claimInstance: instance " + << server << " unknown!" << endl; } void @@ -326,8 +326,8 @@ for (ServerMap::iterator i = m_servers.begin(); i != m_servers.end(); ++i) { if (i->second.first == server) { if (i->second.second == 0) { - std::cerr << "ERROR: FFTDataServer::releaseInstance(" - << server << "): instance not allocated" << std::endl; + cerr << "ERROR: FFTDataServer::releaseInstance(" + << server << "): instance not allocated" << endl; } else if (--i->second.second == 0) { /*!!! if (server->m_lastUsedCache == -1) { // never used @@ -349,9 +349,9 @@ for (ServerQueue::iterator j = m_releasedServers.begin(); j != m_releasedServers.end(); ++j) { if (*j == server) { - std::cerr << "ERROR: FFTDataServer::releaseInstance(" + cerr << "ERROR: FFTDataServer::releaseInstance(" << server << "): server is already in " - << "released servers list" << std::endl; + << "released servers list" << endl; found = true; } } @@ -370,8 +370,8 @@ } } - std::cerr << "ERROR: FFTDataServer::releaseInstance(" << server << "): " - << "instance not found" << std::endl; + cerr << "ERROR: FFTDataServer::releaseInstance(" << server << "): " + << "instance not found" << endl; } void @@ -398,9 +398,9 @@ if (i->second.first == server) { found = true; if (i->second.second > 0) { - std::cerr << "ERROR: FFTDataServer::purgeLimbo: Server " + cerr << "ERROR: FFTDataServer::purgeLimbo: Server " << server << " is in released queue, but still has non-zero refcount " - << i->second.second << std::endl; + << i->second.second << endl; // ... so don't delete it break; } @@ -416,9 +416,9 @@ } if (!found) { - std::cerr << "ERROR: FFTDataServer::purgeLimbo: Server " + cerr << "ERROR: FFTDataServer::purgeLimbo: Server " << server << " is in released queue, but not in server map!" - << std::endl; + << endl; delete server; } @@ -455,7 +455,7 @@ #endif if (i->second.second > 0) { - std::cerr << "WARNING: FFTDataServer::modelAboutToBeDeleted: Model " << model << " (\"" << model->objectName() << "\") is about to be deleted, but is still being referred to by FFT server " << server << " with non-zero refcount " << i->second.second << std::endl; + cerr << "WARNING: FFTDataServer::modelAboutToBeDeleted: Model " << model << " (\"" << model->objectName() << "\") is about to be deleted, but is still being referred to by FFT server " << server << " with non-zero refcount " << i->second.second << endl; server->suspendWrites(); return; } @@ -509,7 +509,7 @@ m_fillThread(0) { #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "])::FFTDataServer" << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "])::FFTDataServer" << endl; #endif //!!! end is not correct until model finished reading -- what to do??? @@ -521,8 +521,8 @@ m_height = m_fftSize / 2 + 1; // DC == 0, Nyquist == fftsize/2 #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << "): dimensions are " - << m_width << "x" << m_height << std::endl; + cerr << "FFTDataServer(" << this << "): dimensions are " + << m_width << "x" << m_height << endl; #endif size_t maxCacheSize = 20 * 1024 * 1024; @@ -531,7 +531,7 @@ else m_cacheWidth = maxCacheSize / columnSize; #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << "): cache width nominal " + cerr << "FFTDataServer(" << this << "): cache width nominal " << m_cacheWidth << ", actual "; #endif @@ -543,8 +543,8 @@ m_cacheWidthMask = m_cacheWidth - 1; #ifdef DEBUG_FFT_SERVER - std::cerr << m_cacheWidth << " (power " << m_cacheWidthPower << ", mask " - << m_cacheWidthMask << ")" << std::endl; + cerr << m_cacheWidth << " (power " << m_cacheWidthPower << ", mask " + << m_cacheWidthMask << ")" << endl; #endif if (m_criteria == StorageAdviser::NoCriteria) { @@ -581,7 +581,7 @@ FFTW_MEASURE); if (!m_fftPlan) { - std::cerr << "ERROR: fftf_plan_dft_r2c_1d(" << m_windowSize << ") failed!" << std::endl; + cerr << "ERROR: fftf_plan_dft_r2c_1d(" << m_windowSize << ") failed!" << endl; throw(0); } @@ -591,7 +591,7 @@ FFTDataServer::~FFTDataServer() { #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "])::~FFTDataServer()" << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "])::~FFTDataServer()" << endl; #endif m_suspended = false; @@ -621,7 +621,7 @@ FFTDataServer::deleteProcessingData() { #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): deleteProcessingData" << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): deleteProcessingData" << endl; #endif if (m_fftInput) { fftf_destroy_plan(m_fftPlan); @@ -636,7 +636,7 @@ FFTDataServer::suspend() { #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): suspend" << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): suspend" << endl; #endif Profiler profiler("FFTDataServer::suspend", false); @@ -648,7 +648,7 @@ FFTDataServer::suspendWrites() { #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): suspendWrites" << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): suspendWrites" << endl; #endif Profiler profiler("FFTDataServer::suspendWrites", false); @@ -659,7 +659,7 @@ FFTDataServer::resume() { #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): resume" << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): resume" << endl; #endif Profiler profiler("FFTDataServer::resume", false); @@ -717,7 +717,7 @@ StorageAdviser::recommend(m_criteria, minimumSize, maximumSize); } -// std::cerr << "Recommendation was: " << recommendation << std::endl; +// cerr << "Recommendation was: " << recommendation << endl; memoryCache = false; @@ -730,9 +730,9 @@ (recommendation & StorageAdviser::ConserveSpace); #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer: memory cache = " << memoryCache << ", compact cache = " << compactCache << std::endl; + cerr << "FFTDataServer: memory cache = " << memoryCache << ", compact cache = " << compactCache << endl; - std::cerr << "Width " << w << " of " << m_width << ", height " << h << ", size " << w * h << std::endl; + cerr << "Width " << w << " of " << m_width << ", height " << h << ", size " << w * h << endl; #endif } @@ -792,10 +792,10 @@ delete cb->memoryCache; cb->memoryCache = 0; - std::cerr << "WARNING: Memory allocation failed when creating" + cerr << "WARNING: Memory allocation failed when creating" << " FFT memory cache no. " << c << " of " << width << "x" << m_height << " (of total width " << m_width - << "): falling back to disc cache" << std::endl; + << "): falling back to disc cache" << endl; memoryCache = false; } @@ -819,8 +819,8 @@ delete cb->fileCacheWriter; cb->fileCacheWriter = 0; - std::cerr << "ERROR: Failed to construct disc cache for FFT data: " - << e.what() << std::endl; + cerr << "ERROR: Failed to construct disc cache for FFT data: " + << e.what() << endl; throw; } @@ -858,8 +858,8 @@ delete cb->fileCacheReader[me]; cb->fileCacheReader.erase(me); - std::cerr << "ERROR: Failed to construct disc cache reader for FFT data: " - << e.what() << std::endl; + cerr << "ERROR: Failed to construct disc cache reader for FFT data: " + << e.what() << endl; return false; } @@ -1218,28 +1218,28 @@ Profiler profiler("FFTDataServer::fillColumn", false); if (!m_model->isReady()) { - std::cerr << "WARNING: FFTDataServer::fillColumn(" - << x << "): model not yet ready" << std::endl; + cerr << "WARNING: FFTDataServer::fillColumn(" + << x << "): model not yet ready" << endl; return; } /* if (!m_fftInput) { - std::cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): " + cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): " << "input has already been completed and discarded?" - << std::endl; + << endl; return; } */ if (x >= m_width) { - std::cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): " + cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): " << "x > width (" << x << " > " << m_width << ")" - << std::endl; + << endl; return; } size_t col; #ifdef DEBUG_FFT_SERVER_FILL - std::cout << "FFTDataServer::fillColumn(" << x << ")" << std::endl; + cout << "FFTDataServer::fillColumn(" << x << ")" << endl; #endif FFTCacheWriter *cache = getCacheWriter(x, col); if (!cache) return; @@ -1279,9 +1279,9 @@ } if (!m_fftInput) { - std::cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): " + cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): " << "input has already been completed and discarded?" - << std::endl; + << endl; return; } @@ -1488,7 +1488,7 @@ while (m_server.m_suspended) { #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): suspended, waiting..." << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): suspended, waiting..." << endl; #endif MutexLocker locker(&m_server.m_fftBuffersLock, "FFTDataServer::run::m_fftBuffersLock [1]"); @@ -1496,7 +1496,7 @@ m_server.m_condition.wait(&m_server.m_fftBuffersLock, 10000); } #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): waited" << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): waited" << endl; #endif if (m_server.m_exiting) return; } @@ -1537,7 +1537,7 @@ while (m_server.m_suspended) { #ifdef DEBUG_FFT_SERVER - std::cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): suspended, waiting..." << std::endl; + cerr << "FFTDataServer(" << this << " [" << (void *)QThread::currentThreadId() << "]): suspended, waiting..." << endl; #endif { MutexLocker locker(&m_server.m_fftBuffersLock,
--- a/data/fft/FFTFileCacheReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fft/FFTFileCacheReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -44,7 +44,7 @@ writer->getWidth(), writer->getHeight() * 2 + m_factorSize)) { -// std::cerr << "FFTFileCacheReader: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == Polar ? "Polar" : "Rectangular") << std::endl; +// cerr << "FFTFileCacheReader: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == Polar ? "Polar" : "Rectangular") << endl; } FFTFileCacheReader::~FFTFileCacheReader() @@ -267,8 +267,8 @@ } m_readbufGood = good; } catch (FileReadFailed f) { - std::cerr << "ERROR: FFTFileCacheReader::populateReadBuf: File read failed: " - << f.what() << std::endl; + cerr << "ERROR: FFTFileCacheReader::populateReadBuf: File read failed: " + << f.what() << endl; memset(m_readbuf, 0, m_mfc->getHeight() * 2 * m_mfc->getCellSize()); } m_readbufCol = x;
--- a/data/fft/FFTFileCacheWriter.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fft/FFTFileCacheWriter.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -44,7 +44,7 @@ width, height * 2 + m_factorSize)) { #ifdef DEBUG_FFT_FILE_CACHE_WRITER - std::cerr << "FFTFileCacheWriter: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == FFTCache::Polar ? "Polar" : "Rectangular") << ", size " << width << "x" << height << std::endl; + cerr << "FFTFileCacheWriter: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == FFTCache::Polar ? "Polar" : "Rectangular") << ", size " << width << "x" << height << endl; #endif m_mfc->setAutoClose(true); m_writebuf = new char[(height * 2 + m_factorSize) * m_mfc->getCellSize()]; @@ -114,7 +114,7 @@ static float maxFactor = 0; if (factor > maxFactor) maxFactor = factor; #ifdef DEBUG_FFT_FILE_CACHE_WRITER - std::cerr << "Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << std::endl; + cerr << "Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << endl; #endif setNormalizationFactorToWritebuf(factor); @@ -167,7 +167,7 @@ static float maxFactor = 0; if (factor > maxFactor) maxFactor = factor; #ifdef DEBUG_FFT_FILE_CACHE_WRITER - std::cerr << "[RI] Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << std::endl; + cerr << "[RI] Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << endl; #endif setNormalizationFactorToWritebuf(factor);
--- a/data/fft/FFTMemoryCache.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fft/FFTMemoryCache.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -35,8 +35,8 @@ m_storageType(storageType) { #ifdef DEBUG_FFT_MEMORY_CACHE - std::cerr << "FFTMemoryCache[" << this << "]::FFTMemoryCache (type " - << m_storageType << "), size " << m_width << "x" << m_height << std::endl; + cerr << "FFTMemoryCache[" << this << "]::FFTMemoryCache (type " + << m_storageType << "), size " << m_width << "x" << m_height << endl; #endif initialise(); @@ -45,7 +45,7 @@ FFTMemoryCache::~FFTMemoryCache() { #ifdef DEBUG_FFT_MEMORY_CACHE - std::cerr << "FFTMemoryCache[" << this << "]::~FFTMemoryCache" << std::endl; + cerr << "FFTMemoryCache[" << this << "]::~FFTMemoryCache" << endl; #endif for (size_t i = 0; i < m_width; ++i) { @@ -74,7 +74,7 @@ size_t width = m_width, height = m_height; #ifdef DEBUG_FFT_MEMORY_CACHE - std::cerr << "FFTMemoryCache[" << this << "]::initialise(" << width << "x" << height << " = " << width*height << ")" << std::endl; + cerr << "FFTMemoryCache[" << this << "]::initialise(" << width << "x" << height << " = " << width*height << ")" << endl; #endif if (m_storageType == FFTCache::Compact) { @@ -96,7 +96,7 @@ m_height = height; #ifdef DEBUG_FFT_MEMORY_CACHE - std::cerr << "done, width = " << m_width << " height = " << m_height << std::endl; + cerr << "done, width = " << m_width << " height = " << m_height << endl; #endif }
--- a/data/fileio/AudioFileReaderFactory.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/AudioFileReaderFactory.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -80,7 +80,7 @@ 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; + cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString() << endl; return 0; } @@ -315,20 +315,20 @@ SVDEBUG << "AudioFileReaderFactory: Reader is OK" << endl; return reader; } - std::cerr << "AudioFileReaderFactory: Preferred reader for " - << "url \"" << source.getLocation().toStdString() + cerr << "AudioFileReaderFactory: Preferred reader for " + << "url \"" << source.getLocation() << "\" (content type \"" << source.getContentType() << "\") failed"; if (reader->getError() != "") { - std::cerr << ": \"" << reader->getError() << "\""; + cerr << ": \"" << reader->getError() << "\""; } - std::cerr << std::endl; + cerr << endl; delete reader; reader = 0; } - std::cerr << "AudioFileReaderFactory: No reader" << std::endl; + cerr << "AudioFileReaderFactory: No reader" << endl; return reader; }
--- a/data/fileio/BZipFileDevice.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/BZipFileDevice.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -19,6 +19,8 @@ #include <iostream> +#include "base/Debug.h" + BZipFileDevice::BZipFileDevice(QString fileName) : m_fileName(fileName), m_file(0), @@ -88,7 +90,7 @@ return false; } -// std::cerr << "BZipFileDevice: opened \"" << m_fileName << "\" for writing" << std::endl; +// cerr << "BZipFileDevice: opened \"" << m_fileName << "\" for writing" << endl; setErrorString(QString()); setOpenMode(mode); @@ -115,7 +117,7 @@ return false; } -// std::cerr << "BZipFileDevice: opened \"" << m_fileName << "\" for reading" << std::endl; +// cerr << "BZipFileDevice: opened \"" << m_fileName << "\" for reading" << endl; m_atEnd = false; @@ -143,7 +145,7 @@ if (openMode() & WriteOnly) { unsigned int in = 0, out = 0; BZ2_bzWriteClose(&bzError, m_bzFile, 0, &in, &out); -// std::cerr << "Wrote bzip2 stream (in=" << in << ", out=" << out << ")" << std::endl; +// cerr << "Wrote bzip2 stream (in=" << in << ", out=" << out << ")" << endl; if (bzError != BZ_OK) { setErrorString(tr("bzip2 stream write close error")); } @@ -182,7 +184,7 @@ if (bzError != BZ_OK) { if (bzError != BZ_STREAM_END) { - std::cerr << "BZipFileDevice::readData: error condition" << std::endl; + cerr << "BZipFileDevice::readData: error condition" << endl; setErrorString(tr("bzip2 stream read error")); m_ok = false; return -1; @@ -204,7 +206,7 @@ // SVDEBUG << "BZipFileDevice::writeData: " << maxSize << " to write" << endl; if (bzError != BZ_OK) { - std::cerr << "BZipFileDevice::writeData: error condition" << std::endl; + cerr << "BZipFileDevice::writeData: error condition" << endl; setErrorString("bzip2 stream write error"); m_ok = false; return -1;
--- a/data/fileio/CSVFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/CSVFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -113,12 +113,12 @@ if (!ok) { if (m_warnings < warnLimit) { - std::cerr << "WARNING: CSVFileReader::load: " - << "Bad time format (\"" << s.toStdString() + cerr << "WARNING: CSVFileReader::load: " + << "Bad time format (\"" << s << "\") in data line " - << lineno+1 << std::endl; + << lineno+1 << endl; } else if (m_warnings == warnLimit) { - std::cerr << "WARNING: Too many warnings" << std::endl; + cerr << "WARNING: Too many warnings" << endl; } ++m_warnings; } @@ -332,15 +332,15 @@ if (!ok) { if (warnings < warnLimit) { - std::cerr << "WARNING: CSVFileReader::load: " + cerr << "WARNING: CSVFileReader::load: " << "Non-numeric value \"" - << list[i].toStdString() + << list[i] << "\" in data line " << lineno+1 - << ":" << std::endl; - std::cerr << line << std::endl; + << ":" << endl; + cerr << line << endl; ++warnings; } else if (warnings == warnLimit) { -// std::cerr << "WARNING: Too many warnings" << std::endl; +// cerr << "WARNING: Too many warnings" << endl; } } }
--- a/data/fileio/CSVFormat.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/CSVFormat.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -176,11 +176,11 @@ } } -// std::cerr << "Estimated column qualities: "; +// cerr << "Estimated column qualities: "; // for (int i = 0; i < m_columnCount; ++i) { -// std::cerr << int(m_columnQualities[i]) << " "; +// cerr << int(m_columnQualities[i]) << " "; // } -// std::cerr << std::endl; +// cerr << endl; } void @@ -288,15 +288,15 @@ } } -// std::cerr << "Estimated column purposes: "; +// cerr << "Estimated column purposes: "; // for (int i = 0; i < m_columnCount; ++i) { -// std::cerr << int(m_columnPurposes[i]) << " "; +// cerr << int(m_columnPurposes[i]) << " "; // } -// std::cerr << std::endl; +// cerr << endl; -// std::cerr << "Estimated model type: " << m_modelType << std::endl; -// std::cerr << "Estimated timing type: " << m_timingType << std::endl; -// std::cerr << "Estimated units: " << m_timeUnits << std::endl; +// cerr << "Estimated model type: " << m_modelType << endl; +// cerr << "Estimated timing type: " << m_timingType << endl; +// cerr << "Estimated units: " << m_timeUnits << endl; } CSVFormat::ColumnPurpose
--- a/data/fileio/CachedFile.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/CachedFile.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -157,7 +157,7 @@ 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; + cerr << "CachedFile::check: Retrieval failed, will try again later (using existing file for now)" << endl; } } } else { @@ -168,7 +168,7 @@ m_ok = true; updateLastRetrieval(true); } else { - std::cerr << "CachedFile::check: Retrieval failed, remaining in invalid state" << std::endl; + cerr << "CachedFile::check: Retrieval failed, remaining in invalid state" << endl; // again, we don't need to do anything here -- the last // retrieval timestamp is already invalid } @@ -212,7 +212,7 @@ QFile previous(m_localFilename); if (previous.exists()) { if (!previous.remove()) { - std::cerr << "CachedFile::retrieve: ERROR: Failed to remove previous copy of cached file at \"" << m_localFilename << "\"" << std::endl; + cerr << "CachedFile::retrieve: ERROR: Failed to remove previous copy of cached file at \"" << m_localFilename << "\"" << endl; return false; } } @@ -222,7 +222,7 @@ //!!! disk space left) if (!tempFile.copy(m_localFilename)) { - std::cerr << "CachedFile::retrieve: ERROR: Failed to copy newly retrieved file from \"" << tempName << "\" to \"" << m_localFilename << "\"" << std::endl; + cerr << "CachedFile::retrieve: ERROR: Failed to copy newly retrieved file from \"" << tempName << "\" to \"" << m_localFilename << "\"" << endl; return false; }
--- a/data/fileio/CodedAudioFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/CodedAudioFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -63,7 +63,7 @@ if (m_cacheFileName != "") { if (!QFile(m_cacheFileName).remove()) { - std::cerr << "WARNING: CodedAudioFileReader::~CodedAudioFileReader: Failed to delete cache file \"" << m_cacheFileName << "\"" << std::endl; + cerr << "WARNING: CodedAudioFileReader::~CodedAudioFileReader: Failed to delete cache file \"" << m_cacheFileName << "\"" << endl; } } @@ -83,7 +83,7 @@ void CodedAudioFileReader::endSerialised() { - SVDEBUG << "CodedAudioFileReader(" << this << ")::endSerialised: id = " << (m_serialiser ? m_serialiser->getId().toStdString() : "(none)") << endl; + SVDEBUG << "CodedAudioFileReader(" << this << ")::endSerialised: id = " << (m_serialiser ? m_serialiser->getId() : "(none)") << endl; delete m_serialiser; m_serialiser = 0; @@ -97,7 +97,7 @@ SVDEBUG << "CodedAudioFileReader::initialiseDecodeCache: file rate = " << m_fileRate << endl; if (m_fileRate == 0) { - std::cerr << "CodedAudioFileReader::initialiseDecodeCache: ERROR: File sample rate unknown (bug in subclass implementation?)" << std::endl; + cerr << "CodedAudioFileReader::initialiseDecodeCache: ERROR: File sample rate unknown (bug in subclass implementation?)" << endl; throw FileOperationFailed("(coded file)", "File sample rate unknown (bug in subclass implementation?)"); } if (m_sampleRate == 0) { @@ -146,7 +146,7 @@ m_cacheFileReader = new WavFileReader(m_cacheFileName); if (!m_cacheFileReader->isOK()) { - std::cerr << "ERROR: CodedAudioFileReader::initialiseDecodeCache: Failed to construct WAV file reader for temporary file: " << m_cacheFileReader->getError() << std::endl; + cerr << "ERROR: CodedAudioFileReader::initialiseDecodeCache: Failed to construct WAV file reader for temporary file: " << m_cacheFileReader->getError() << endl; delete m_cacheFileReader; m_cacheFileReader = 0; m_cacheMode = CacheInMemory; @@ -154,12 +154,12 @@ } } else { - std::cerr << "CodedAudioFileReader::initialiseDecodeCache: failed to open cache file \"" << m_cacheFileName << "\" (" << m_channelCount << " channels, sample rate " << m_sampleRate << " for writing, falling back to in-memory cache" << std::endl; + cerr << "CodedAudioFileReader::initialiseDecodeCache: failed to open cache file \"" << m_cacheFileName << "\" (" << m_channelCount << " channels, sample rate " << m_sampleRate << " for writing, falling back to in-memory cache" << endl; m_cacheMode = CacheInMemory; } } catch (DirectoryCreationFailed f) { - std::cerr << "CodedAudioFileReader::initialiseDecodeCache: failed to create temporary directory! Falling back to in-memory cache" << std::endl; + cerr << "CodedAudioFileReader::initialiseDecodeCache: failed to create temporary directory! Falling back to in-memory cache" << endl; m_cacheMode = CacheInMemory; } } @@ -266,7 +266,7 @@ Profiler profiler("CodedAudioFileReader::finishDecodeCache", true); if (!m_initialised) { - std::cerr << "WARNING: CodedAudioFileReader::finishDecodeCache: Cache was never initialised!" << std::endl; + cerr << "WARNING: CodedAudioFileReader::finishDecodeCache: Cache was never initialised!" << endl; return; }
--- a/data/fileio/CoreAudioFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/CoreAudioFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -77,7 +77,7 @@ Profiler profiler("CoreAudioFileReader::CoreAudioFileReader", true); - SVDEBUG << "CoreAudioFileReader: path is \"" << m_path.toStdString() << "\"" << endl; + SVDEBUG << "CoreAudioFileReader: path is \"" << m_path << "\"" << endl; QByteArray ba = m_path.toLocal8Bit(); @@ -124,7 +124,7 @@ m_channelCount = m_d->asbd.mChannelsPerFrame; m_fileRate = m_d->asbd.mSampleRate; - std::cerr << "CoreAudioReadStream: " << m_channelCount << " channels, " << m_fileRate << " Hz" << std::endl; + cerr << "CoreAudioReadStream: " << m_channelCount << " channels, " << m_fileRate << " Hz" << endl; m_d->asbd.mFormatID = kAudioFormatLinearPCM; m_d->asbd.mFormatFlags = @@ -174,7 +174,7 @@ //!!! progress? - // std::cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << std::endl; + // cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << endl; // buffers are interleaved unless specified otherwise addSamplesToDecodeCache((float *)m_d->buffer.mBuffers[0].mData, framesRead); @@ -191,7 +191,7 @@ CoreAudioFileReader::~CoreAudioFileReader() { - std::cerr << "CoreAudioFileReader::~CoreAudioFileReader" << std::endl; + cerr << "CoreAudioFileReader::~CoreAudioFileReader" << endl; if (m_d->valid) { ExtAudioFileDispose(m_d->file);
--- a/data/fileio/FFTFuzzyAdapter.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/FFTFuzzyAdapter.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -43,10 +43,10 @@ while (xratio > 1) { if (xratio & 0x1) { - std::cerr << "ERROR: FFTFuzzyAdapter: Window increment ratio " + cerr << "ERROR: FFTFuzzyAdapter: Window increment ratio " << windowIncrement << " / " << m_server->getWindowIncrement() - << " must be a power of two" << std::endl; + << " must be a power of two" << endl; assert(!(xratio & 0x1)); } ++m_xshift; @@ -55,9 +55,9 @@ while (yratio > 1) { if (yratio & 0x1) { - std::cerr << "ERROR: FFTFuzzyAdapter: FFT size ratio " + cerr << "ERROR: FFTFuzzyAdapter: FFT size ratio " << m_server->getFFTSize() << " / " << fftSize - << " must be a power of two" << std::endl; + << " must be a power of two" << endl; assert(!(yratio & 0x1)); } ++m_yshift;
--- a/data/fileio/FileReadThread.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/FileReadThread.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -108,7 +108,7 @@ m_cancelledRequests[token] = m_readyRequests[token]; m_readyRequests.erase(token); } else { - std::cerr << "WARNING: FileReadThread::cancel: token " << token << " not found" << std::endl; + cerr << "WARNING: FileReadThread::cancel: token " << token << " not found" << endl; } } @@ -195,11 +195,11 @@ m_readyRequests.erase(token); found = true; } else if (m_queue.find(token) != m_queue.end()) { - std::cerr << "WARNING: FileReadThread::done(" << token << "): request is still in queue (wait or cancel it)" << std::endl; + cerr << "WARNING: FileReadThread::done(" << token << "): request is still in queue (wait or cancel it)" << endl; } if (!found) { - std::cerr << "WARNING: FileReadThread::done(" << token << "): request not found" << std::endl; + cerr << "WARNING: FileReadThread::done(" << token << "): request not found" << endl; } } @@ -257,20 +257,20 @@ if (seekFailed) { ::perror("Seek failed"); - std::cerr << "ERROR: FileReadThread::process: seek to " - << request.start << " failed" << std::endl; + cerr << "ERROR: FileReadThread::process: seek to " + << request.start << " failed" << endl; request.size = 0; } else { if (r < 0) { ::perror("ERROR: FileReadThread::process: Read failed"); - std::cerr << "ERROR: FileReadThread::process: read of " + cerr << "ERROR: FileReadThread::process: read of " << request.size << " at " - << request.start << " failed" << std::endl; + << request.start << " failed" << endl; request.size = 0; } else if (r < ssize_t(request.size)) { - std::cerr << "WARNING: FileReadThread::process: read " + cerr << "WARNING: FileReadThread::process: read " << request.size << " returned only " << r << " bytes" - << std::endl; + << endl; request.size = r; usleep(100000); } else {
--- a/data/fileio/FileSource.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/FileSource.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -59,12 +59,12 @@ } else { ++urlExtantCountMap[url]; } - std::cerr << "FileSource: Now " << urlExtantCountMap[url] << " for this url, " << extantCount << " total" << std::endl; + cerr << "FileSource: Now " << urlExtantCountMap[url] << " for this url, " << extantCount << " total" << endl; } static void decCount(QString url) { --extantCount; --urlExtantCountMap[url]; - std::cerr << "FileSource: Now " << urlExtantCountMap[url] << " for this url, " << extantCount << " total" << std::endl; + cerr << "FileSource: Now " << urlExtantCountMap[url] << " for this url, " << extantCount << " total" << endl; } #endif @@ -95,12 +95,12 @@ } #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource(" << fileOrUrl << "): url <" << m_url.toString() << ">" << std::endl; + cerr << "FileSource::FileSource(" << fileOrUrl << "): url <" << m_url.toString() << ">" << endl; incCount(m_url.toString()); #endif if (!canHandleScheme(m_url)) { - std::cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << std::endl; + cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; m_errorString = tr("Unsupported scheme in URL"); return; } @@ -110,11 +110,11 @@ if (!isRemote() && !isAvailable()) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource: Failed to open local file with URL \"" << m_url.toString() << "\"; trying again assuming filename was encoded" << std::endl; + cerr << "FileSource::FileSource: Failed to open local file with URL \"" << m_url.toString() << "\"; trying again assuming filename was encoded" << endl; #endif m_url = QUrl::fromEncoded(fileOrUrl.toLatin1()); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource: URL is now \"" << m_url.toString() << "\"" << std::endl; + cerr << "FileSource::FileSource: URL is now \"" << m_url.toString() << "\"" << endl; #endif init(); } @@ -130,11 +130,11 @@ // The URL was created on the assumption that the string // was human-readable. Let's try again, this time // assuming it was already encoded. - std::cerr << "FileSource::FileSource: Failed to retrieve URL \"" - << fileOrUrl.toStdString() + cerr << "FileSource::FileSource: Failed to retrieve URL \"" + << fileOrUrl << "\" as human-readable URL; " << "trying again treating it as encoded URL" - << std::endl; + << endl; // even though our cache file doesn't exist (because the // resource was 404), we still need to ensure we're no @@ -158,7 +158,7 @@ } #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource(string) exiting" << std::endl; + cerr << "FileSource::FileSource(string) exiting" << endl; #endif } @@ -176,12 +176,12 @@ m_refCounted(false) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource(" << url.toString() << ") [as url]" << std::endl; + cerr << "FileSource::FileSource(" << url.toString() << ") [as url]" << endl; incCount(m_url.toString()); #endif if (!canHandleScheme(m_url)) { - std::cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << std::endl; + cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; m_errorString = tr("Unsupported scheme in URL"); return; } @@ -189,7 +189,7 @@ init(); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource(url) exiting" << std::endl; + cerr << "FileSource::FileSource(url) exiting" << endl; #endif } @@ -208,12 +208,12 @@ m_refCounted(false) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]" << std::endl; + cerr << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]" << endl; incCount(m_url.toString()); #endif if (!canHandleScheme(m_url)) { - std::cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << std::endl; + cerr << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl; m_errorString = tr("Unsupported scheme in URL"); return; } @@ -223,13 +223,13 @@ } else { QMutexLocker locker(&m_mapMutex); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource(copy ctor): ref count is " - << m_refCountMap[m_url] << std::endl; + cerr << "FileSource::FileSource(copy ctor): ref count is " + << m_refCountMap[m_url] << endl; #endif if (m_refCountMap[m_url] > 0) { m_refCountMap[m_url]++; #ifdef DEBUG_FILE_SOURCE - std::cerr << "raised it to " << m_refCountMap[m_url] << std::endl; + cerr << "raised it to " << m_refCountMap[m_url] << endl; #endif m_localFilename = m_remoteLocalMap[m_url]; m_refCounted = true; @@ -242,18 +242,18 @@ m_done = true; #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]: note: local filename is \"" << m_localFilename << "\"" << std::endl; + cerr << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]: note: local filename is \"" << m_localFilename << "\"" << endl; #endif #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::FileSource(copy ctor) exiting" << std::endl; + cerr << "FileSource::FileSource(copy ctor) exiting" << endl; #endif } FileSource::~FileSource() { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource(" << m_url.toString() << ")::~FileSource" << std::endl; + cerr << "FileSource(" << m_url.toString() << ")::~FileSource" << endl; decCount(m_url.toString()); #endif @@ -274,14 +274,14 @@ if (isResource()) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: Is a resource" << std::endl; + cerr << "FileSource::init: Is a resource" << endl; #endif QString resourceFile = m_url.toString(); resourceFile.replace(QRegExp("^qrc:"), ":"); if (!QFileInfo(resourceFile).exists()) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: Resource file of this name does not exist, switching to non-resource URL" << std::endl; + cerr << "FileSource::init: Resource file of this name does not exist, switching to non-resource URL" << endl; #endif m_url = resourceFile; m_resource = false; @@ -290,7 +290,7 @@ if (!isRemote() && !isResource()) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: Not a remote URL" << std::endl; + cerr << "FileSource::init: Not a remote URL" << endl; #endif bool literal = false; m_localFilename = m_url.toLocalFile(); @@ -299,17 +299,17 @@ // QUrl may have mishandled the scheme (e.g. in a DOS path) m_localFilename = m_rawFileOrUrl; #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: Trying literal local filename \"" - << m_localFilename << "\"" << std::endl; + cerr << "FileSource::init: Trying literal local filename \"" + << m_localFilename << "\"" << endl; #endif literal = true; } m_localFilename = QFileInfo(m_localFilename).absoluteFilePath(); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: URL translates to absolute filename \"" + cerr << "FileSource::init: URL translates to absolute filename \"" << m_localFilename << "\" (with literal=" << literal << ")" - << std::endl; + << endl; #endif m_ok = true; m_lastStatus = 200; @@ -319,7 +319,7 @@ m_lastStatus = 404; } else { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: Local file of this name does not exist, trying URL as a literal filename" << std::endl; + cerr << "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 @@ -337,7 +337,7 @@ if (createCacheFile()) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: Already have this one" << std::endl; + cerr << "FileSource::init: Already have this one" << endl; #endif m_ok = true; if (!QFileInfo(m_localFilename).exists()) { @@ -366,7 +366,7 @@ QByteArray ba(resourceFile.readAll()); #ifdef DEBUG_FILE_SOURCE - std::cerr << "Copying " << ba.size() << " bytes from resource file to cache file" << std::endl; + cerr << "Copying " << ba.size() << " bytes from resource file to cache file" << endl; #endif qint64 written = m_localFile->write(ba); @@ -376,7 +376,7 @@ if (written != ba.size()) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "Copy failed (wrote " << written << " bytes)" << std::endl; + cerr << "Copy failed (wrote " << written << " bytes)" << endl; #endif m_ok = false; return; @@ -391,14 +391,14 @@ QString scheme = m_url.scheme().toLower(); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: Don't have local copy of \"" - << m_url.toString() << "\", retrieving" << std::endl; + cerr << "FileSource::init: Don't have local copy of \"" + << m_url.toString() << "\", retrieving" << endl; #endif if (scheme == "http" || scheme == "https" || scheme == "ftp") { initRemote(); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource: initRemote returned" << std::endl; + cerr << "FileSource: initRemote returned" << endl; #endif } else { m_remote = false; @@ -416,7 +416,7 @@ cleanup(); m_refCountMap[m_url]++; #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::init: Another FileSource has got there first, abandoning our download and using theirs" << std::endl; + cerr << "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; @@ -452,8 +452,8 @@ if (m_preferredContentType != "") { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource: indicating preferred content type of \"" - << m_preferredContentType << "\"" << std::endl; + cerr << "FileSource: indicating preferred content type of \"" + << m_preferredContentType << "\"" << endl; #endif req.setRawHeader ("Accept", @@ -521,8 +521,8 @@ if (!m_ok) available = false; else available = (m_lastStatus / 100 == 2); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::isAvailable: " << (available ? "yes" : "no") - << std::endl; + cerr << "FileSource::isAvailable: " << (available ? "yes" : "no") + << endl; #endif return available; } @@ -531,7 +531,7 @@ FileSource::waitForStatus() { while (m_ok && (!m_done && m_lastStatus == 0)) { -// std::cerr << "waitForStatus: processing (last status " << m_lastStatus << ")" << std::endl; +// cerr << "waitForStatus: processing (last status " << m_lastStatus << ")" << endl; QCoreApplication::processEvents(); } } @@ -540,7 +540,7 @@ FileSource::waitForData() { while (m_ok && !m_done) { -// std::cerr << "FileSource::waitForData: calling QApplication::processEvents" << std::endl; +// cerr << "FileSource::waitForData: calling QApplication::processEvents" << endl; QCoreApplication::processEvents(); usleep(10000); } @@ -626,11 +626,11 @@ FileSource::metaDataChanged() { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::metaDataChanged" << std::endl; + cerr << "FileSource::metaDataChanged" << endl; #endif if (!m_reply) { - std::cerr << "WARNING: FileSource::metaDataChanged() called without a reply object being known to us" << std::endl; + cerr << "WARNING: FileSource::metaDataChanged() called without a reply object being known to us" << endl; return; } @@ -641,8 +641,8 @@ QString location = m_reply->header (QNetworkRequest::LocationHeader).toString(); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::metaDataChanged: redirect to \"" - << location << "\" received" << std::endl; + cerr << "FileSource::metaDataChanged: redirect to \"" + << location << "\" received" << endl; #endif if (location != "") { QUrl newUrl(location); @@ -671,13 +671,13 @@ .arg(m_reply->attribute (QNetworkRequest::HttpReasonPhraseAttribute).toString()); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::metaDataChanged: " - << m_errorString << std::endl; + cerr << "FileSource::metaDataChanged: " + << m_errorString << endl; #endif } else { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::metaDataChanged: " - << m_lastStatus << std::endl; + cerr << "FileSource::metaDataChanged: " + << m_lastStatus << endl; #endif m_contentType = m_reply->header(QNetworkRequest::ContentTypeHeader).toString(); @@ -708,7 +708,7 @@ emit progress(100); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::replyFinished()" << std::endl; + cerr << "FileSource::replyFinished()" << endl; #endif if (m_done) return; @@ -730,7 +730,7 @@ if (error) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::done: error is " << error << ", deleting cache file" << std::endl; + cerr << "FileSource::done: error is " << error << ", deleting cache file" << endl; #endif deleteCacheFile(); } @@ -756,7 +756,7 @@ FileSource::deleteCacheFile() { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::deleteCacheFile(\"" << m_localFilename << "\")" << std::endl; + cerr << "FileSource::deleteCacheFile(\"" << m_localFilename << "\")" << endl; #endif cleanup(); @@ -767,7 +767,7 @@ if (!isRemote()) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "not a cache file" << std::endl; + cerr << "not a cache file" << endl; #endif return; } @@ -780,7 +780,7 @@ if (m_refCountMap[m_url] > 0) { m_refCountMap[m_url]--; #ifdef DEBUG_FILE_SOURCE - std::cerr << "reduced ref count to " << m_refCountMap[m_url] << std::endl; + cerr << "reduced ref count to " << m_refCountMap[m_url] << endl; #endif if (m_refCountMap[m_url] > 0) { m_done = true; @@ -793,11 +793,11 @@ if (!QFile(m_localFilename).remove()) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::deleteCacheFile: ERROR: Failed to delete file \"" << m_localFilename << "\"" << std::endl; + cerr << "FileSource::deleteCacheFile: ERROR: Failed to delete file \"" << m_localFilename << "\"" << endl; #endif } else { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::deleteCacheFile: Deleted cache file \"" << m_localFilename << "\"" << std::endl; + cerr << "FileSource::deleteCacheFile: Deleted cache file \"" << m_localFilename << "\"" << endl; #endif m_localFilename = ""; } @@ -814,14 +814,14 @@ QMutexLocker locker(&m_mapMutex); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::createCacheFile: refcount is " << m_refCountMap[m_url] << std::endl; + cerr << "FileSource::createCacheFile: refcount is " << m_refCountMap[m_url] << endl; #endif if (m_refCountMap[m_url] > 0) { m_refCountMap[m_url]++; m_localFilename = m_remoteLocalMap[m_url]; #ifdef DEBUG_FILE_SOURCE - std::cerr << "raised it to " << m_refCountMap[m_url] << std::endl; + cerr << "raised it to " << m_refCountMap[m_url] << endl; #endif m_refCounted = true; return true; @@ -833,7 +833,7 @@ dir = TempDirectory::getInstance()->getSubDirectoryPath("download"); } catch (DirectoryCreationFailed f) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::createCacheFile: ERROR: Failed to create temporary directory: " << f.what() << std::endl; + cerr << "FileSource::createCacheFile: ERROR: Failed to create temporary directory: " << f.what() << endl; #endif return ""; } @@ -861,7 +861,7 @@ QString filepath(dir.filePath(filename)); #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::createCacheFile: URL is \"" << m_url.toString() << "\", dir is \"" << dir.path() << "\", base \"" << base << "\", extension \"" << extension << "\", filebase \"" << filename << "\", filename \"" << filepath << "\"" << std::endl; + cerr << "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); @@ -872,9 +872,9 @@ !QFile(filepath).open(QFile::WriteOnly)) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::createCacheFile: Failed to create local file \"" + cerr << "FileSource::createCacheFile: Failed to create local file \"" << filepath << "\" for URL \"" - << m_url.toString() << "\" (or file already exists): appending suffix instead" << std::endl; + << m_url.toString() << "\" (or file already exists): appending suffix instead" << endl; #endif if (extension == "") { @@ -888,9 +888,9 @@ !QFile(filepath).open(QFile::WriteOnly)) { #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::createCacheFile: ERROR: Failed to create local file \"" + cerr << "FileSource::createCacheFile: ERROR: Failed to create local file \"" << filepath << "\" for URL \"" - << m_url.toString() << "\" (or file already exists)" << std::endl; + << m_url.toString() << "\" (or file already exists)" << endl; #endif return ""; @@ -898,9 +898,9 @@ } #ifdef DEBUG_FILE_SOURCE - std::cerr << "FileSource::createCacheFile: url " + cerr << "FileSource::createCacheFile: url " << m_url.toString() << " -> local filename " - << filepath << std::endl; + << filepath << endl; #endif m_localFilename = filepath;
--- a/data/fileio/MIDIFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/MIDIFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -39,11 +39,11 @@ #include <sstream> +#include "base/Debug.h" + using std::string; using std::ifstream; using std::stringstream; -using std::cerr; -using std::endl; using std::ends; using std::ios; using std::vector; @@ -713,7 +713,7 @@ void MIDIFileReader::updateTempoMap(unsigned int track) { - std::cerr << "updateTempoMap for track " << track << " (" << m_midiComposition[track].size() << " events)" << std::endl; + cerr << "updateTempoMap for track " << track << " (" << m_midiComposition[track].size() << " events)" << endl; for (MIDITrack::iterator i = m_midiComposition[track].begin(); i != m_midiComposition[track].end(); ++i) { @@ -727,7 +727,7 @@ long tempo = (((m0 << 8) + m1) << 8) + m2; - std::cerr << "updateTempoMap: have tempo, it's " << tempo << " at " << (*i)->getTime() << std::endl; + cerr << "updateTempoMap: have tempo, it's " << tempo << " at " << (*i)->getTime() << endl; if (tempo != 0) { double qpm = 60000000.0 / double(tempo); @@ -790,11 +790,11 @@ SVDEBUG << "MIDIFileReader::getTimeForMIDITime(" << midiTime << ")" << 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; + cerr << "nearest tempo event (of " << m_tempoMap.size() << ") is at " << tempoMIDITime << " (" + << tempoRealTime << ")" << endl; + cerr << "quarters since then = " << quarters << endl; + cerr << "tempo = " << tempo << " quarters per minute" << endl; + cerr << "seconds since then = " << seconds << endl; SVDEBUG << "resulting time = " << (tempoRealTime + RealTime::fromSeconds(seconds)) << endl; */ @@ -932,7 +932,7 @@ if (existingModel) { model = dynamic_cast<NoteModel *>(existingModel); if (!model) { - std::cerr << "WARNING: MIDIFileReader::loadTrack: Existing model given, but it isn't a NoteModel -- ignoring it" << std::endl; + cerr << "WARNING: MIDIFileReader::loadTrack: Existing model given, but it isn't a NoteModel -- ignoring it" << endl; } }
--- a/data/fileio/MP3FileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/MP3FileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -95,8 +95,8 @@ ::close(fd); return; } else if (sz == 0) { - std::cerr << QString("MP3FileReader::MP3FileReader: Warning: reached EOF after only %1 of %2 bytes") - .arg(offset).arg(m_fileSize) << std::endl; + cerr << QString("MP3FileReader::MP3FileReader: Warning: reached EOF after only %1 of %2 bytes") + .arg(offset).arg(m_fileSize) << endl; m_fileSize = offset; break; } @@ -137,11 +137,11 @@ usleep(10); } - std::cerr << "MP3FileReader ctor: exiting with file rate = " << m_fileRate << std::endl; + cerr << "MP3FileReader ctor: exiting with file rate = " << m_fileRate << endl; } if (m_error != "") { - std::cerr << "MP3FileReader::MP3FileReader(\"" << m_path << "\"): ERROR: " << m_error << std::endl; + cerr << "MP3FileReader::MP3FileReader(\"" << m_path << "\"): ERROR: " << m_error << endl; } } @@ -243,7 +243,7 @@ id3_utf8_t *u8str = id3_ucs4_utf8duplicate(ustr); if (!u8str) { - std::cerr << "MP3FileReader::loadTags: ERROR: Internal error: Failed to convert UCS4 to UTF8 in ID3 title" << std::endl; + cerr << "MP3FileReader::loadTags: ERROR: Internal error: Failed to convert UCS4 to UTF8 in ID3 title" << endl; return ""; } @@ -321,7 +321,7 @@ if (length > ID3_TAG_QUERYSIZE) { int taglen = id3_tag_query(start, ID3_TAG_QUERYSIZE); if (taglen > 0) { -// std::cerr << "ID3 tag length to skip: " << taglen << std::endl; +// cerr << "ID3 tag length to skip: " << taglen << endl; start += taglen; length -= taglen; }
--- a/data/fileio/MatchFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/MatchFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -168,16 +168,16 @@ } if (alignment.thisHopTime == 0.0) { - std::cerr << "ERROR in Match file: this hop time == 0, using 0.01 instead" << std::endl; + cerr << "ERROR in Match file: this hop time == 0, using 0.01 instead" << endl; alignment.thisHopTime = 0.01; } if (alignment.refHopTime == 0.0) { - std::cerr << "ERROR in Match file: ref hop time == 0, using 0.01 instead" << std::endl; + cerr << "ERROR in Match file: ref hop time == 0, using 0.01 instead" << endl; alignment.refHopTime = 0.01; } - std::cerr << "MatchFileReader: this hop = " << alignment.thisHopTime << ", ref hop = " << alignment.refHopTime << ", this index count = " << alignment.thisIndex.size() << ", ref index count = " << alignment.refIndex.size() << std::endl; + cerr << "MatchFileReader: this hop = " << alignment.thisHopTime << ", ref hop = " << alignment.refHopTime << ", this index count = " << alignment.thisIndex.size() << ", ref index count = " << alignment.refIndex.size() << endl; return alignment; }
--- a/data/fileio/MatrixFile.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/MatrixFile.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -78,14 +78,14 @@ bool newFile = !QFileInfo(fileName).exists(); if (newFile && m_mode == ReadOnly) { - std::cerr << "ERROR: MatrixFile::MatrixFile: Read-only mode " - << "specified, but cache file does not exist" << std::endl; + cerr << "ERROR: MatrixFile::MatrixFile: Read-only mode " + << "specified, but cache file does not exist" << endl; throw FileNotFound(fileName); } if (!newFile && m_mode == WriteOnly) { - std::cerr << "ERROR: MatrixFile::MatrixFile: Write-only mode " - << "specified, but file already exists" << std::endl; + cerr << "ERROR: MatrixFile::MatrixFile: Write-only mode " + << "specified, but file already exists" << endl; throw FileOperationFailed(fileName, "create"); } @@ -103,23 +103,23 @@ #endif #ifdef DEBUG_MATRIX_FILE - std::cerr << "MatrixFile(" << this << ")::MatrixFile: opening " << fileName << "..." << std::endl; + cerr << "MatrixFile(" << this << ")::MatrixFile: opening " << fileName << "..." << endl; #endif if ((m_fd = ::open(fileName.toLocal8Bit(), m_flags, m_fmode)) < 0) { ::perror("Open failed"); - std::cerr << "ERROR: MatrixFile::MatrixFile: " + cerr << "ERROR: MatrixFile::MatrixFile: " << "Failed to open cache file \"" << fileName << "\""; - if (m_mode == WriteOnly) std::cerr << " for writing"; - std::cerr << std::endl; + if (m_mode == WriteOnly) cerr << " for writing"; + cerr << endl; throw FailedToOpenFile(fileName); } m_createMutex.unlock(); #ifdef DEBUG_MATRIX_FILE - std::cerr << "MatrixFile(" << this << ")::MatrixFile: fd is " << m_fd << std::endl; + cerr << "MatrixFile(" << this << ")::MatrixFile: fd is " << m_fd << endl; #endif if (newFile) { @@ -128,16 +128,16 @@ size_t header[2]; if (::read(m_fd, header, 2 * sizeof(size_t)) < 0) { ::perror("MatrixFile::MatrixFile: read failed"); - std::cerr << "ERROR: MatrixFile::MatrixFile: " + cerr << "ERROR: MatrixFile::MatrixFile: " << "Failed to read header (fd " << m_fd << ", file \"" - << fileName << "\")" << std::endl; + << fileName << "\")" << endl; throw FileReadFailed(fileName); } if (header[0] != m_width || header[1] != m_height) { - std::cerr << "ERROR: MatrixFile::MatrixFile: " + cerr << "ERROR: MatrixFile::MatrixFile: " << "Dimensions in file header (" << header[0] << "x" << header[1] << ") differ from expected dimensions " - << m_width << "x" << m_height << std::endl; + << m_width << "x" << m_height << endl; throw FailedToOpenFile(fileName); } } @@ -146,9 +146,9 @@ ++m_refcount[fileName]; #ifdef DEBUG_MATRIX_FILE - std::cerr << "MatrixFile[" << m_fd << "]::MatrixFile: File " << fileName << ", ref " << m_refcount[fileName] << std::endl; + cerr << "MatrixFile[" << m_fd << "]::MatrixFile: File " << fileName << ", ref " << m_refcount[fileName] << endl; - std::cerr << "MatrixFile[" << m_fd << "]::MatrixFile: Done, size is " << "(" << m_width << ", " << m_height << ")" << std::endl; + cerr << "MatrixFile[" << m_fd << "]::MatrixFile: Done, size is " << "(" << m_width << ", " << m_height << ")" << endl; #endif ++totalCount; @@ -173,9 +173,9 @@ if (--m_refcount[m_fileName] == 0) { if (::unlink(m_fileName.toLocal8Bit())) { - std::cerr << "WARNING: MatrixFile::~MatrixFile: reference count reached 0, but failed to unlink file \"" << m_fileName << "\"" << std::endl; + cerr << "WARNING: MatrixFile::~MatrixFile: reference count reached 0, but failed to unlink file \"" << m_fileName << "\"" << endl; } else { - std::cerr << "deleted " << m_fileName << std::endl; + cerr << "deleted " << m_fileName << endl; } } } @@ -186,8 +186,8 @@ totalCount --; #ifdef DEBUG_MATRIX_FILE - std::cerr << "MatrixFile[" << m_fd << "]::~MatrixFile: " << std::endl; - std::cerr << "MatrixFile: Total storage now " << totalStorage/1024 << "K in " << totalCount << " instances (" << openCount << " open)" << std::endl; + cerr << "MatrixFile[" << m_fd << "]::~MatrixFile: " << endl; + cerr << "MatrixFile: Total storage now " << totalStorage/1024 << "K in " << totalCount << " instances (" << openCount << " open)" << endl; #endif } @@ -203,7 +203,7 @@ off_t off = m_headerSize + (m_width * m_height * m_cellSize) + m_width; #ifdef DEBUG_MATRIX_FILE - std::cerr << "MatrixFile[" << m_fd << "]::initialise(" << m_width << ", " << m_height << "): cell size " << m_cellSize << ", header size " << m_headerSize << ", resizing file" << std::endl; + cerr << "MatrixFile[" << m_fd << "]::initialise(" << m_width << ", " << m_height << "): cell size " << m_cellSize << ", header size " << m_headerSize << ", resizing file" << endl; #endif if (::lseek(m_fd, off - 1, SEEK_SET) < 0) { @@ -235,10 +235,10 @@ } #ifdef DEBUG_MATRIX_FILE - std::cerr << "MatrixFile[" << m_fd << "]::initialise(" << m_width << ", " << m_height << "): storage " - << (m_headerSize + m_width * m_height * m_cellSize + m_width) << std::endl; + cerr << "MatrixFile[" << m_fd << "]::initialise(" << m_width << ", " << m_height << "): storage " + << (m_headerSize + m_width * m_height * m_cellSize + m_width) << endl; - std::cerr << "MatrixFile: Total storage " << totalStorage/1024 << "K" << std::endl; + cerr << "MatrixFile: Total storage " << totalStorage/1024 << "K" << endl; #endif seekTo(0); @@ -257,7 +257,7 @@ m_fd = -1; -- openCount; #ifdef DEBUG_MATRIX_FILE - std::cerr << "MatrixFile: Now " << openCount << " open instances" << std::endl; + cerr << "MatrixFile: Now " << openCount << " open instances" << endl; #endif } } @@ -268,7 +268,7 @@ assert(m_mode == ReadOnly); #ifdef DEBUG_MATRIX_FILE_READ_SET - std::cerr << "MatrixFile[" << m_fd << "]::getColumnAt(" << x << ")" << std::endl; + cerr << "MatrixFile[" << m_fd << "]::getColumnAt(" << x << ")" << endl; #endif Profiler profiler("MatrixFile::getColumnAt"); @@ -280,7 +280,7 @@ unsigned char set = 0; if (!seekTo(x)) { - std::cerr << "ERROR: MatrixFile::getColumnAt(" << x << "): Seek failed" << std::endl; + cerr << "ERROR: MatrixFile::getColumnAt(" << x << "): Seek failed" << endl; throw FileOperationFailed(m_fileName, "seek"); } @@ -290,7 +290,7 @@ throw FileReadFailed(m_fileName); } if (!set) { - std::cerr << "MatrixFile[" << m_fd << "]::getColumnAt(" << x << "): Column has not been set" << std::endl; + cerr << "MatrixFile[" << m_fd << "]::getColumnAt(" << x << "): Column has not been set" << endl; return; } } @@ -315,13 +315,13 @@ Profiler profiler("MatrixFile::haveSetColumnAt"); #ifdef DEBUG_MATRIX_FILE_READ_SET - std::cerr << "MatrixFile[" << m_fd << "]::haveSetColumnAt(" << x << ")" << std::endl; -// std::cerr << "."; + cerr << "MatrixFile[" << m_fd << "]::haveSetColumnAt(" << x << ")" << endl; +// cerr << "."; #endif unsigned char set = 0; if (!seekTo(x)) { - std::cerr << "ERROR: MatrixFile::haveSetColumnAt(" << x << "): Seek failed" << std::endl; + cerr << "ERROR: MatrixFile::haveSetColumnAt(" << x << "): Seek failed" << endl; throw FileOperationFailed(m_fileName, "seek"); } @@ -344,14 +344,14 @@ if (m_fd < 0) return; // closed #ifdef DEBUG_MATRIX_FILE_READ_SET - std::cerr << "MatrixFile[" << m_fd << "]::setColumnAt(" << x << ")" << std::endl; -// std::cerr << "."; + cerr << "MatrixFile[" << m_fd << "]::setColumnAt(" << x << ")" << endl; +// cerr << "."; #endif ssize_t w = 0; if (!seekTo(x)) { - std::cerr << "ERROR: MatrixFile::setColumnAt(" << x << "): Seek failed" << std::endl; + cerr << "ERROR: MatrixFile::setColumnAt(" << x << "): Seek failed" << endl; throw FileOperationFailed(m_fileName, "seek"); } @@ -369,15 +369,15 @@ } /* if (x == 0) { - std::cerr << "Wrote " << m_height * m_cellSize << " bytes, as follows:" << std::endl; + cerr << "Wrote " << m_height * m_cellSize << " bytes, as follows:" << endl; for (int i = 0; i < m_height * m_cellSize; ++i) { - std::cerr << (int)(((char *)data)[i]) << " "; + cerr << (int)(((char *)data)[i]) << " "; } - std::cerr << std::endl; + cerr << endl; } */ if (!seekTo(x)) { - std::cerr << "MatrixFile[" << m_fd << "]::setColumnAt(" << x << "): Seek failed" << std::endl; + cerr << "MatrixFile[" << m_fd << "]::setColumnAt(" << x << "): Seek failed" << endl; throw FileOperationFailed(m_fileName, "seek"); } @@ -392,7 +392,7 @@ if (m_autoClose) { if (m_setColumns->isAllOn()) { #ifdef DEBUG_MATRIX_FILE - std::cerr << "MatrixFile[" << m_fd << "]::setColumnAt(" << x << "): All columns set: auto-closing" << std::endl; + cerr << "MatrixFile[" << m_fd << "]::setColumnAt(" << x << "): All columns set: auto-closing" << endl; #endif close(); /* @@ -401,7 +401,7 @@ for (int i = 0; i < m_width; ++i) { if (m_setColumns->get(i)) ++set; } - std::cerr << "MatrixFile[" << m_fd << "]::setColumnAt(" << x << "): Auto-close on, but not all columns set yet (" << set << " of " << m_width << ")" << std::endl; + cerr << "MatrixFile[" << m_fd << "]::setColumnAt(" << x << "): Auto-close on, but not all columns set yet (" << set << " of " << m_width << ")" << endl; */ } } @@ -411,7 +411,7 @@ MatrixFile::seekTo(size_t x) const { if (m_fd < 0) { - std::cerr << "ERROR: MatrixFile::seekTo: File not open" << std::endl; + cerr << "ERROR: MatrixFile::seekTo: File not open" << endl; return false; } @@ -421,18 +421,18 @@ #ifdef DEBUG_MATRIX_FILE_READ_SET if (m_mode == ReadOnly) { - std::cerr << "MatrixFile[" << m_fd << "]::seekTo(" << x << "): off = " << off << std::endl; + cerr << "MatrixFile[" << m_fd << "]::seekTo(" << x << "): off = " << off << endl; } #endif #ifdef DEBUG_MATRIX_FILE_READ_SET - std::cerr << "MatrixFile[" << m_fd << "]::seekTo(" << x << "): off = " << off << std::endl; + cerr << "MatrixFile[" << m_fd << "]::seekTo(" << x << "): off = " << off << endl; #endif if (::lseek(m_fd, off, SEEK_SET) == (off_t)-1) { ::perror("Seek failed"); - std::cerr << "ERROR: MatrixFile::seekTo(" << x - << ") = " << off << " failed" << std::endl; + cerr << "ERROR: MatrixFile::seekTo(" << x + << ") = " << off << " failed" << endl; return false; }
--- a/data/fileio/OggVorbisFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/OggVorbisFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -50,7 +50,7 @@ m_channelCount = 0; m_fileRate = 0; -// SVDEBUG << "OggVorbisFileReader::OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (++instances) << " instances" << endl; +// SVDEBUG << "OggVorbisFileReader::OggVorbisFileReader(" << m_path << "): now have " << (++instances) << " instances" << endl; Profiler profiler("OggVorbisFileReader::OggVorbisFileReader", true); @@ -102,7 +102,7 @@ OggVorbisFileReader::~OggVorbisFileReader() { -// SVDEBUG << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (--instances) << " instances" << endl; +// SVDEBUG << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path << "): now have " << (--instances) << " instances" << endl; if (m_decodeThread) { m_cancelled = true; m_decodeThread->wait();
--- a/data/fileio/PlaylistFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/PlaylistFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -133,10 +133,10 @@ QString testpath = QDir(m_basedir).filePath(line); if (QFileInfo(testpath).exists() && QFileInfo(testpath).isFile()) { - std::cerr << "Path \"" << line.toStdString() + cerr << "Path \"" << line << "\" is relative, resolving to \"" << testpath << "\"" - << std::endl; + << endl; line = testpath; } }
--- a/data/fileio/QuickTimeFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/QuickTimeFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -149,7 +149,7 @@ m_error = QString("File is protected with DRM"); return; } else if (m_d->err == kQTPropertyNotSupportedErr && !isProtected) { - std::cerr << "QuickTime: File is not protected with DRM" << std::endl; + cerr << "QuickTime: File is not protected with DRM" << endl; } if (m_d->movie) { @@ -186,7 +186,7 @@ m_channelCount = m_d->asbd.mChannelsPerFrame; m_fileRate = m_d->asbd.mSampleRate; - std::cerr << "QuickTime: " << m_channelCount << " channels, " << m_fileRate << " kHz" << std::endl; + cerr << "QuickTime: " << m_channelCount << " channels, " << m_fileRate << " kHz" << endl; m_d->asbd.mFormatFlags = kAudioFormatFlagIsFloat | @@ -240,7 +240,7 @@ //!!! progress? -// std::cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << std::endl; +// cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << endl; // QuickTime buffers are interleaved unless specified otherwise addSamplesToDecodeCache(m_d->data, framesRead); @@ -267,7 +267,7 @@ } } - std::cerr << "QuickTimeFileReader::QuickTimeFileReader: frame count is now " << getFrameCount() << ", error is \"\"" << m_error << "\"" << std::endl; + cerr << "QuickTimeFileReader::QuickTimeFileReader: frame count is now " << getFrameCount() << ", error is \"\"" << m_error << "\"" << endl; } QuickTimeFileReader::~QuickTimeFileReader()
--- a/data/fileio/WavFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/WavFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -40,9 +40,9 @@ m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo); if (!m_file || (!fileUpdating && m_fileInfo.channels <= 0)) { - std::cerr << "WavFileReader::initialize: Failed to open file at \"" + cerr << "WavFileReader::initialize: Failed to open file at \"" << m_path << "\" (" - << sf_strerror(m_file) << ")" << std::endl; + << sf_strerror(m_file) << ")" << endl; if (m_file) { m_error = QString("Couldn't load audio file '%1':\n%2") @@ -67,14 +67,14 @@ // every file type of "at least" the historical period of Ogg // or FLAC as non-seekable. int type = m_fileInfo.format & SF_FORMAT_TYPEMASK; -// std::cerr << "WavFileReader: format type is " << type << " (flac, ogg are " << SF_FORMAT_FLAC << ", " << SF_FORMAT_OGG << ")" << std::endl; +// cerr << "WavFileReader: format type is " << type << " (flac, ogg are " << SF_FORMAT_FLAC << ", " << SF_FORMAT_OGG << ")" << endl; if (type >= SF_FORMAT_FLAC || type >= SF_FORMAT_OGG) { -// std::cerr << "WavFileReader: Recording as non-seekable" << std::endl; +// cerr << "WavFileReader: Recording as non-seekable" << endl; m_seekable = false; } } -// std::cerr << "WavFileReader: Frame count " << m_frameCount << ", channel count " << m_channelCount << ", sample rate " << m_sampleRate << ", seekable " << m_seekable << std::endl; +// cerr << "WavFileReader: Frame count " << m_frameCount << ", channel count " << m_channelCount << ", sample rate " << m_sampleRate << ", seekable " << m_seekable << endl; } @@ -95,8 +95,8 @@ sf_close(m_file); m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo); if (!m_file || m_fileInfo.channels <= 0) { - std::cerr << "WavFileReader::updateFrameCount: Failed to open file at \"" << m_path << "\" (" - << sf_strerror(m_file) << ")" << std::endl; + cerr << "WavFileReader::updateFrameCount: Failed to open file at \"" << m_path << "\" (" + << sf_strerror(m_file) << ")" << endl; } } @@ -110,7 +110,7 @@ } if (m_frameCount != prevCount) { -// std::cerr << "frameCountChanged" << std::endl; +// cerr << "frameCountChanged" << endl; emit frameCountChanged(); } } @@ -151,21 +151,21 @@ if (start != m_lastStart || count != m_lastCount) { if (sf_seek(m_file, start, SEEK_SET) < 0) { -// std::cerr << "sf_seek failed" << std::endl; +// cerr << "sf_seek failed" << endl; return; } if (count * m_fileInfo.channels > m_bufsiz) { -// std::cerr << "WavFileReader: Reallocating buffer for " << count +// cerr << "WavFileReader: Reallocating buffer for " << count // << " frames, " << m_fileInfo.channels << " channels: " -// << m_bufsiz << " floats" << std::endl; +// << m_bufsiz << " floats" << endl; m_bufsiz = count * m_fileInfo.channels; delete[] m_buffer; m_buffer = new float[m_bufsiz]; } if ((readCount = sf_readf_float(m_file, m_buffer, count)) < 0) { -// std::cerr << "sf_readf_float failed" << std::endl; +// cerr << "sf_readf_float failed" << endl; return; } @@ -175,7 +175,7 @@ for (size_t i = 0; i < count * m_fileInfo.channels; ++i) { if (i >= m_bufsiz) { - std::cerr << "INTERNAL ERROR: WavFileReader::getInterleavedFrames: " << i << " >= " << m_bufsiz << std::endl; + cerr << "INTERNAL ERROR: WavFileReader::getInterleavedFrames: " << i << " >= " << m_bufsiz << endl; } results.push_back(m_buffer[i]); }
--- a/data/fileio/WavFileWriter.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/WavFileWriter.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -45,16 +45,16 @@ m_file = sf_open(m_temp->getTemporaryFilename().toLocal8Bit(), SFM_WRITE, &fileInfo); if (!m_file) { - std::cerr << "WavFileWriter: Failed to open file (" - << sf_strerror(m_file) << ")" << std::endl; + cerr << "WavFileWriter: Failed to open file (" + << sf_strerror(m_file) << ")" << endl; m_error = QString("Failed to open audio file '%1' for writing") .arg(m_temp->getTemporaryFilename()); } } else { m_file = sf_open(m_path.toLocal8Bit(), SFM_WRITE, &fileInfo); if (!m_file) { - std::cerr << "WavFileWriter: Failed to open file (" - << sf_strerror(m_file) << ")" << std::endl; + cerr << "WavFileWriter: Failed to open file (" + << sf_strerror(m_file) << ")" << endl; m_error = QString("Failed to open audio file '%1' for writing") .arg(m_path); }
--- a/data/fileio/test/main.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/test/main.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -22,10 +22,10 @@ } if (bad > 0) { - std::cerr << "\n********* " << bad << " test suite(s) failed!\n" << std::endl; + cerr << "\n********* " << bad << " test suite(s) failed!\n" << endl; return 1; } else { - std::cerr << "All tests passed" << std::endl; + cerr << "All tests passed" << endl; return 0; } }
--- a/data/midi/MIDIInput.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/midi/MIDIInput.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -80,10 +80,10 @@ int count = 0, max = 5; while (m_buffer.getWriteSpace() == 0) { if (count == max) { - std::cerr << "ERROR: MIDIInput::postEvent: MIDI event queue is full and not clearing -- abandoning incoming event" << std::endl; + cerr << "ERROR: MIDIInput::postEvent: MIDI event queue is full and not clearing -- abandoning incoming event" << endl; return; } - std::cerr << "WARNING: MIDIInput::postEvent: MIDI event queue (capacity " << m_buffer.getSize() << " is full!" << std::endl; + cerr << "WARNING: MIDIInput::postEvent: MIDI event queue (capacity " << m_buffer.getSize() << " is full!" << endl; SVDEBUG << "Waiting for something to be processed" << endl; #ifdef _WIN32 Sleep(1);
--- a/data/midi/rtmidi/RtMidi.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/midi/rtmidi/RtMidi.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -40,6 +40,9 @@ #include "RtMidi.h" #include <sstream> +using std::cerr; +using std::endl; + //*********************************************************************// // Common RtMidi Definitions //*********************************************************************// @@ -52,15 +55,15 @@ void RtMidi :: error( RtError::Type type ) { if (type == RtError::WARNING) { - std::cerr << '\n' << errorString_ << "\n\n"; + cerr << '\n' << errorString_ << "\n\n"; } else if (type == RtError::DEBUG_WARNING) { #if defined(__RTMIDI_DEBUG__) - std::cerr << '\n' << errorString_ << "\n\n"; + cerr << '\n' << errorString_ << "\n\n"; #endif } else { - std::cerr << '\n' << errorString_ << "\n\n"; + cerr << '\n' << errorString_ << "\n\n"; throw RtError( errorString_, type ); } } @@ -242,7 +245,7 @@ if ( data->queueLimit > data->queue.size() ) data->queue.push( message ); else - std::cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; + cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; } message.bytes.clear(); } @@ -304,7 +307,7 @@ if ( data->queueLimit > data->queue.size() ) data->queue.push( message ); else - std::cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; + cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; } message.bytes.clear(); } @@ -715,13 +718,13 @@ result = snd_midi_event_new( 0, &apiData->coder ); if ( result < 0 ) { data->doInput = false; - std::cerr << "\nRtMidiIn::alsaMidiHandler: error initializing MIDI event parser!\n\n"; + cerr << "\nRtMidiIn::alsaMidiHandler: error initializing MIDI event parser!\n\n"; return 0; } unsigned char *buffer = (unsigned char *) malloc( apiData->bufferSize ); if ( buffer == NULL ) { data->doInput = false; - std::cerr << "\nRtMidiIn::alsaMidiHandler: error initializing buffer memory!\n\n"; + cerr << "\nRtMidiIn::alsaMidiHandler: error initializing buffer memory!\n\n"; return 0; } snd_midi_event_init( apiData->coder ); @@ -738,11 +741,11 @@ // If here, there should be data. result = snd_seq_event_input( apiData->seq, &ev ); if ( result == -ENOSPC ) { - std::cerr << "\nRtMidiIn::alsaMidiHandler: MIDI input buffer overrun!\n\n"; + cerr << "\nRtMidiIn::alsaMidiHandler: MIDI input buffer overrun!\n\n"; continue; } else if ( result <= 0 ) { - std::cerr << "RtMidiIn::alsaMidiHandler: unknown MIDI input error!\n"; + cerr << "RtMidiIn::alsaMidiHandler: unknown MIDI input error!\n"; continue; } @@ -755,7 +758,7 @@ case SND_SEQ_EVENT_PORT_SUBSCRIBED: #if defined(__RTMIDI_DEBUG__) - std::cout << "RtMidiIn::alsaMidiHandler: port connection made!\n"; + cout << "RtMidiIn::alsaMidiHandler: port connection made!\n"; #endif break; @@ -766,7 +769,7 @@ //not related to this particular connection. As it stands, I //see no data provided in the "source" and "dest" fields so //there is nothing we can do about this at this time. - // std::cout << "sender = " << ev->source.client << ", dest = " << ev->dest.port << endl; + // cout << "sender = " << ev->source.client << ", dest = " << ev->dest.port << endl; #endif //data->doInput = false; break; @@ -788,7 +791,7 @@ buffer = (unsigned char *) malloc( apiData->bufferSize ); if ( buffer == NULL ) { data->doInput = false; - std::cerr << "\nRtMidiIn::alsaMidiHandler: error resizing buffer memory!\n\n"; + cerr << "\nRtMidiIn::alsaMidiHandler: error resizing buffer memory!\n\n"; break; } } @@ -797,7 +800,7 @@ nBytes = snd_midi_event_decode( apiData->coder, buffer, apiData->bufferSize, ev ); if ( nBytes <= 0 ) { #if defined(__RTMIDI_DEBUG__) - std::cerr << "\nRtMidiIn::alsaMidiHandler: event parsing error or not a MIDI event!\n\n"; + cerr << "\nRtMidiIn::alsaMidiHandler: event parsing error or not a MIDI event!\n\n"; #endif break; } @@ -847,7 +850,7 @@ if ( data->queueLimit > data->queue.size() ) data->queue.push( message ); else - std::cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; + cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; } } @@ -1379,7 +1382,7 @@ int fd = mdGetFd( apiData->port ); if ( fd < 0 ) { data->doInput = false; - std::cerr << "\nRtMidiIn::irixMidiHandler: error getting port descriptor!\n\n"; + cerr << "\nRtMidiIn::irixMidiHandler: error getting port descriptor!\n\n"; return 0; } @@ -1404,7 +1407,7 @@ // If here, there should be data. result = mdReceive( apiData->port, &event, 1); if ( result <= 0 ) { - std::cerr << "\nRtMidiIn::irixMidiHandler: MIDI input read error!\n\n"; + cerr << "\nRtMidiIn::irixMidiHandler: MIDI input read error!\n\n"; continue; } @@ -1433,7 +1436,7 @@ if ( data->queueLimit > data->queue.size() ) data->queue.push( message ); else - std::cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; + cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; } message.bytes.clear(); } @@ -1477,7 +1480,7 @@ if ( data->queueLimit > data->queue.size() ) data->queue.push( message ); else - std::cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; + cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; } message.bytes.clear(); } @@ -1837,7 +1840,7 @@ //if ( sysex->dwBytesRecorded > 0 ) { MMRESULT result = midiInAddBuffer( apiData->inHandle, apiData->sysexBuffer, sizeof(MIDIHDR) ); if ( result != MMSYSERR_NOERROR ) - std::cerr << "\nRtMidiIn::midiInputCallback: error sending sysex to Midi device!!\n\n"; + cerr << "\nRtMidiIn::midiInputCallback: error sending sysex to Midi device!!\n\n"; if ( data->ignoreFlags & 0x01 ) return; } @@ -1853,7 +1856,7 @@ if ( data->queueLimit > data->queue.size() ) data->queue.push( apiData->message ); else - std::cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; + cerr << "\nRtMidiIn: message queue limit reached!!\n\n"; } // Clear the vector for the next input message.
--- a/data/model/AlignmentModel.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/AlignmentModel.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -167,7 +167,7 @@ AlignmentModel::pathChanged() { if (m_pathComplete) { - std::cerr << "AlignmentModel: deleting raw path model" << std::endl; + cerr << "AlignmentModel: deleting raw path model" << endl; if (m_rawPath) m_rawPath->aboutToDelete(); delete m_rawPath; m_rawPath = 0; @@ -219,8 +219,8 @@ { if (!m_path) { if (!m_rawPath) { - std::cerr << "ERROR: AlignmentModel::constructPath: " - << "No raw path available" << std::endl; + cerr << "ERROR: AlignmentModel::constructPath: " + << "No raw path available" << endl; return; } m_path = new PathModel @@ -251,8 +251,8 @@ { if (!m_reversePath) { if (!m_path) { - std::cerr << "ERROR: AlignmentModel::constructReversePath: " - << "No forward path available" << std::endl; + cerr << "ERROR: AlignmentModel::constructReversePath: " + << "No forward path available" << endl; return; } m_reversePath = new PathModel @@ -304,7 +304,7 @@ PathModel::PointList::const_iterator i = points.lower_bound(point); if (i == points.end()) { #ifdef DEBUG_ALIGNMENT_MODEL - std::cerr << "Note: i == points.end()" << std::endl; + cerr << "Note: i == points.end()" << endl; #endif --i; } @@ -318,13 +318,13 @@ if (++i != points.end()) { #ifdef DEBUG_ALIGNMENT_MODEL - std::cerr << "another point available" << std::endl; + cerr << "another point available" << endl; #endif followingFrame = i->frame; followingMapFrame = i->mapframe; } else { #ifdef DEBUG_ALIGNMENT_MODEL - std::cerr << "no other point available" << std::endl; + cerr << "no other point available" << endl; #endif }
--- a/data/model/DenseTimeValueModel.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/DenseTimeValueModel.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -33,7 +33,7 @@ { size_t ch = getChannelCount(); - std::cerr << "f0 = " << f0 << ", f1 = " << f1 << std::endl; + cerr << "f0 = " << f0 << ", f1 = " << f1 << endl; if (f1 <= f0) return "";
--- a/data/model/EditableDenseThreeDimensionalModel.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/EditableDenseThreeDimensionalModel.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -177,7 +177,7 @@ { assert(index < m_data.size()); - //std::cout << "truncateAndStore(" << index << ", " << values.size() << ")" << std::endl; + //cout << "truncateAndStore(" << index << ", " << values.size() << ")" << endl; // The default case is to store the entire column at m_data[index] // and place 0 at m_trunc[index] to indicate that it has not been @@ -274,8 +274,8 @@ // given += values.size(); // stored += values.size(); -// std::cout << "given: " << given << ", stored: " << stored << " (" -// << ((float(stored) / float(given)) * 100.f) << "%)" << std::endl; +// cout << "given: " << given << ", stored: " << stored << " (" +// << ((float(stored) / float(given)) * 100.f) << "%)" << endl; // default case if nothing wacky worked out m_data[index] = values; @@ -302,7 +302,7 @@ Column p = expandAndRetrieve(index - tdist); int psize = p.size(), csize = c.size(); if (psize != m_yBinCount) { - std::cerr << "WARNING: EditableDenseThreeDimensionalModel::expandAndRetrieve: Trying to expand from incorrectly sized column" << std::endl; + cerr << "WARNING: EditableDenseThreeDimensionalModel::expandAndRetrieve: Trying to expand from incorrectly sized column" << endl; } if (top) { for (int i = csize; i < psize; ++i) {
--- a/data/model/FFTModel.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/FFTModel.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -61,10 +61,10 @@ while (xratio > 1) { if (xratio & 0x1) { - std::cerr << "ERROR: FFTModel: Window increment ratio " + cerr << "ERROR: FFTModel: Window increment ratio " << windowIncrement << " / " << m_server->getWindowIncrement() - << " must be a power of two" << std::endl; + << " must be a power of two" << endl; assert(!(xratio & 0x1)); } ++m_xshift; @@ -73,9 +73,9 @@ while (yratio > 1) { if (yratio & 0x1) { - std::cerr << "ERROR: FFTModel: FFT size ratio " + cerr << "ERROR: FFTModel: FFT size ratio " << m_server->getFFTSize() << " / " << fftSize - << " must be a power of two" << std::endl; + << " must be a power of two" << endl; assert(!(yratio & 0x1)); } ++m_yshift; @@ -92,7 +92,7 @@ FFTModel::sourceModelAboutToBeDeleted() { if (m_sourceModel) { - std::cerr << "FFTModel[" << this << "]::sourceModelAboutToBeDeleted(" << m_sourceModel << ")" << std::endl; + cerr << "FFTModel[" << this << "]::sourceModelAboutToBeDeleted(" << m_sourceModel << ")" << endl; if (m_server) { FFTDataServer::releaseInstance(m_server); m_server = 0;
--- a/data/model/Model.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/Model.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -59,13 +59,13 @@ void Model::aboutToDelete() { -// std::cerr << "Model(" << this << ")::aboutToDelete()" << std::endl; +// cerr << "Model(" << this << ")::aboutToDelete()" << endl; if (m_aboutToDelete) { - std::cerr << "WARNING: Model(" << this << ", \"" + cerr << "WARNING: Model(" << this << ", \"" << objectName() << "\")::aboutToDelete: " << "aboutToDelete called more than once for the same model" - << std::endl; + << endl; } emit aboutToBeDeleted(); @@ -141,7 +141,7 @@ } int completion = 0; (void)m_alignment->isReady(&completion); -// std::cerr << " -> " << completion << std::endl; +// cerr << " -> " << completion << endl; return completion; }
--- a/data/model/ModelDataTableModel.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/ModelDataTableModel.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -205,7 +205,7 @@ m_sortOrdering = sortOrder; int current = getCurrentRow(); if (current != prevCurrent) { -// std::cerr << "Current row changed from " << prevCurrent << " to " << current << " for underlying row " << m_currentRow << std::endl; +// cerr << "Current row changed from " << prevCurrent << " to " << current << " for underlying row " << m_currentRow << endl; emit currentChanged(createIndex(current, 0, (void *)0)); } emit layoutChanged(); @@ -297,7 +297,7 @@ bool numeric = (m_model->getSortType(m_sortColumn) == TabularModel::SortNumeric); -// std::cerr << "resort: numeric == " << numeric << std::endl; +// cerr << "resort: numeric == " << numeric << endl; m_sort.clear(); m_rsort.clear(); @@ -338,7 +338,7 @@ } for (MapType::iterator i = rowMap.begin(); i != rowMap.end(); ++i) { -// std::cerr << "resortNumeric: " << i->second << ": " << i->first << std::endl; +// cerr << "resortNumeric: " << i->second << ": " << i->first << endl; m_rsort.push_back(i->second); } @@ -362,7 +362,7 @@ } for (MapType::iterator i = rowMap.begin(); i != rowMap.end(); ++i) { -// std::cerr << "resortAlphabetical: " << i->second << ": " << i->first << std::endl; +// cerr << "resortAlphabetical: " << i->second << ": " << i->first << endl; m_rsort.push_back(i->second); } @@ -388,7 +388,7 @@ m_sort.clear(); // int current = getCurrentRow(); //!!! no -- not until the sort criteria have changed // if (current != prevCurrent) { -// std::cerr << "Current row changed from " << prevCurrent << " to " << current << " for underlying row " << m_currentRow << std::endl; +// cerr << "Current row changed from " << prevCurrent << " to " << current << " for underlying row " << m_currentRow << endl; // emit currentRowChanged(createIndex(current, 0, 0)); // } }
--- a/data/model/PowerOfSqrtTwoZoomConstraint.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/PowerOfSqrtTwoZoomConstraint.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -34,7 +34,7 @@ int &power, RoundingDirection dir) const { -// std::cerr << "given " << blockSize << std::endl; +// cerr << "given " << blockSize << endl; size_t minCachePower = getMinCachePower();
--- a/data/model/WaveFileModel.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/WaveFileModel.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -32,9 +32,6 @@ //#define DEBUG_WAVE_FILE_MODEL 1 -using std::cerr; -using std::endl; - PowerOfSqrtTwoZoomConstraint WaveFileModel::m_zoomConstraint; @@ -191,7 +188,7 @@ // Could be much more efficient (although compiler optimisation will help) #ifdef DEBUG_WAVE_FILE_MODEL - std::cout << "WaveFileModel::getData[" << this << "]: " << channel << ", " << start << ", " << count << ", " << buffer << std::endl; + cout << "WaveFileModel::getData[" << this << "]: " << channel << ", " << start << ", " << count << ", " << buffer << endl; #endif if (start >= m_startFrame) { @@ -253,7 +250,7 @@ double *buffer) const { #ifdef DEBUG_WAVE_FILE_MODEL - std::cout << "WaveFileModel::getData(double)[" << this << "]: " << channel << ", " << start << ", " << count << ", " << buffer << std::endl; + cout << "WaveFileModel::getData(double)[" << this << "]: " << channel << ", " << start << ", " << count << ", " << buffer << endl; #endif if (start > m_startFrame) { @@ -311,22 +308,22 @@ float **buffer) const { #ifdef DEBUG_WAVE_FILE_MODEL - std::cout << "WaveFileModel::getData[" << this << "]: " << fromchannel << "," << tochannel << ", " << start << ", " << count << ", " << buffer << std::endl; + cout << "WaveFileModel::getData[" << this << "]: " << fromchannel << "," << tochannel << ", " << start << ", " << count << ", " << buffer << endl; #endif size_t channels = getChannelCount(); if (fromchannel > tochannel) { - std::cerr << "ERROR: WaveFileModel::getData: fromchannel (" + cerr << "ERROR: WaveFileModel::getData: fromchannel (" << fromchannel << ") > tochannel (" << tochannel << ")" - << std::endl; + << endl; return 0; } if (tochannel >= channels) { - std::cerr << "ERROR: WaveFileModel::getData: tochannel (" + cerr << "ERROR: WaveFileModel::getData: tochannel (" << tochannel << ") >= channel count (" << channels << ")" - << std::endl; + << endl; return 0; } @@ -702,7 +699,7 @@ m_model.m_reader->getInterleavedFrames(frame, readBlockSize, block); -// std::cerr << "block is " << block.size() << std::endl; +// cerr << "block is " << block.size() << endl; for (int i = 0; i < readBlockSize; ++i) { @@ -755,12 +752,12 @@ m_fillExtent = frame; } -// std::cerr << "WaveFileModel: inner loop ended" << std::endl; +// cerr << "WaveFileModel: inner loop ended" << endl; first = false; if (m_model.m_exiting) break; if (updating) { -// std::cerr << "sleeping..." << std::endl; +// cerr << "sleeping..." << endl; sleep(1); } }
--- a/data/model/WritableWaveFileModel.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/model/WritableWaveFileModel.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -48,7 +48,7 @@ path = dir.filePath(QString("written_%1.wav") .arg((intptr_t)this)); } catch (DirectoryCreationFailed f) { - std::cerr << "WritableWaveFileModel: Failed to create temporary directory" << std::endl; + cerr << "WritableWaveFileModel: Failed to create temporary directory" << endl; return; } } @@ -58,7 +58,7 @@ m_writer = new WavFileWriter(path, sampleRate, channels, WavFileWriter::WriteToTarget); if (!m_writer->isOK()) { - std::cerr << "WritableWaveFileModel: Error in creating WAV file writer: " << m_writer->getError() << std::endl; + cerr << "WritableWaveFileModel: Error in creating WAV file writer: " << m_writer->getError() << endl; delete m_writer; m_writer = 0; return; @@ -68,7 +68,7 @@ m_reader = new WavFileReader(source, true); if (!m_reader->getError().isEmpty()) { - std::cerr << "WritableWaveFileModel: Error in creating wave file reader" << std::endl; + cerr << "WritableWaveFileModel: Error in creating wave file reader" << endl; delete m_reader; m_reader = 0; return; @@ -76,7 +76,7 @@ m_model = new WaveFileModel(source, m_reader); if (!m_model->isOK()) { - std::cerr << "WritableWaveFileModel: Error in creating wave file model" << std::endl; + cerr << "WritableWaveFileModel: Error in creating wave file model" << endl; delete m_model; m_model = 0; delete m_reader; @@ -114,7 +114,7 @@ #endif if (!m_writer->writeSamples(samples, count)) { - std::cerr << "ERROR: WritableWaveFileModel::addSamples: writer failed: " << m_writer->getError() << std::endl; + cerr << "ERROR: WritableWaveFileModel::addSamples: writer failed: " << m_writer->getError() << endl; return false; }
--- a/data/osc/OSCQueue.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/osc/OSCQueue.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -32,8 +32,8 @@ void OSCQueue::oscError(int num, const char *msg, const char *path) { - std::cerr << "ERROR: OSCQueue::oscError: liblo server error " << num - << " in path " << path << ": " << msg << std::endl; + cerr << "ERROR: OSCQueue::oscError: liblo server error " << num + << " in path " << path << ": " << msg << endl; } int @@ -73,9 +73,9 @@ case 'c': message.addArg(arg->c); break; case 't': message.addArg(arg->i); break; case 's': message.addArg(&arg->s); break; - default: std::cerr << "WARNING: OSCQueue::oscMessageHandler: " + default: cerr << "WARNING: OSCQueue::oscMessageHandler: " << "Unsupported OSC type '" << type << "'" - << std::endl; + << endl; break; } @@ -104,8 +104,8 @@ lo_server_thread_start(m_thread); - std::cout << "OSCQueue::OSCQueue: Base OSC URL is " - << lo_server_thread_get_url(m_thread) << std::endl; + cout << "OSCQueue::OSCQueue: Base OSC URL is " + << lo_server_thread_get_url(m_thread) << endl; #endif } @@ -163,10 +163,10 @@ int count = 0, max = 5; while (m_buffer.getWriteSpace() == 0) { if (count == max) { - std::cerr << "ERROR: OSCQueue::postMessage: OSC message queue is full and not clearing -- abandoning incoming message" << std::endl; + cerr << "ERROR: OSCQueue::postMessage: OSC message queue is full and not clearing -- abandoning incoming message" << endl; return; } - std::cerr << "WARNING: OSCQueue::postMessage: OSC message queue (capacity " << m_buffer.getSize() << " is full!" << std::endl; + cerr << "WARNING: OSCQueue::postMessage: OSC message queue (capacity " << m_buffer.getSize() << " is full!" << endl; SVDEBUG << "Waiting for something to be processed" << endl; #ifdef _WIN32 Sleep(1); @@ -212,10 +212,10 @@ method = path.section('/', i, -1); if (method.contains('/')) { - std::cerr << "ERROR: OSCQueue::parseOSCPath: malformed path \"" + cerr << "ERROR: OSCQueue::parseOSCPath: malformed path \"" << path << "\" (should be target/data/method or " << "target/method or method, where target and data " - << "are numeric)" << std::endl; + << "are numeric)" << endl; return false; }
--- a/plugin/DSSIPluginFactory.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/plugin/DSSIPluginFactory.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -159,7 +159,7 @@ if (m_libraryHandles.find(soname) == m_libraryHandles.end()) { loadLibrary(soname); if (m_libraryHandles.find(soname) == m_libraryHandles.end()) { - std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: loadLibrary failed for " << soname << std::endl; + cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: loadLibrary failed for " << soname << endl; return 0; } firstInLibrary = true; @@ -171,7 +171,7 @@ DLSYM(libraryHandle, "dssi_descriptor"); if (!fn) { - std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: No descriptor function in library " << soname << std::endl; + cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: No descriptor function in library " << soname << endl; return 0; } @@ -188,7 +188,7 @@ ++index; } - std::cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: No such plugin as " << label << " in library " << soname << std::endl; + cerr << "WARNING: DSSIPluginFactory::getDSSIDescriptor: No such plugin as " << label << " in library " << soname << endl; return 0; } @@ -291,8 +291,8 @@ void *libraryHandle = DLOPEN(soname, RTLD_LAZY); if (!libraryHandle) { - std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins: couldn't load plugin library " - << soname << " - " << DLERROR() << std::endl; + cerr << "WARNING: DSSIPluginFactory::discoverPlugins: couldn't load plugin library " + << soname << " - " << DLERROR() << endl; return; } @@ -300,7 +300,7 @@ DLSYM(libraryHandle, "dssi_descriptor"); if (!fn) { - std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins: No descriptor function in " << soname << std::endl; + cerr << "WARNING: DSSIPluginFactory::discoverPlugins: No descriptor function in " << soname << endl; return; } @@ -311,7 +311,7 @@ const LADSPA_Descriptor *ladspaDescriptor = descriptor->LADSPA_Plugin; if (!ladspaDescriptor) { - std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins: No LADSPA descriptor for plugin " << index << " in " << soname << std::endl; + cerr << "WARNING: DSSIPluginFactory::discoverPlugins: No LADSPA descriptor for plugin " << index << " in " << soname << endl; ++index; continue; } @@ -358,12 +358,12 @@ rtd->category = category.toStdString(); -// std::cerr << "Plugin id is " << ladspaDescriptor->UniqueID -// << ", identifier is \"" << identifier.toStdString() -// << "\", category is \"" << category.toStdString() +// cerr << "Plugin id is " << ladspaDescriptor->UniqueID +// << ", identifier is \"" << identifier +// << "\", category is \"" << category // << "\", name is " << ladspaDescriptor->Name // << ", label is " << ladspaDescriptor->Label -// << std::endl; +// << endl; def_uri = lrdf_get_default_uri(ladspaDescriptor->UniqueID); if (def_uri) { @@ -380,7 +380,7 @@ for (unsigned int j = 0; j < defs->count; j++) { if (defs->items[j].pid == controlPortNumber) { -// std::cerr << "Default for this port (" << defs->items[j].pid << ", " << defs->items[j].label << ") is " << defs->items[j].value << "; applying this to port number " << i << " with name " << ladspaDescriptor->PortNames[i] << std::endl; +// cerr << "Default for this port (" << defs->items[j].pid << ", " << defs->items[j].label << ") is " << defs->items[j].value << "; applying this to port number " << i << " with name " << ladspaDescriptor->PortNames[i] << endl; m_portDefaults[ladspaDescriptor->UniqueID][i] = defs->items[j].value; } @@ -421,7 +421,7 @@ } if (DLCLOSE(libraryHandle) != 0) { - std::cerr << "WARNING: DSSIPluginFactory::discoverPlugins - can't unload " << libraryHandle << std::endl; + cerr << "WARNING: DSSIPluginFactory::discoverPlugins - can't unload " << libraryHandle << endl; return; } }
--- a/plugin/DSSIPluginInstance.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/plugin/DSSIPluginInstance.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -41,7 +41,7 @@ #ifdef DEBUG_DSSI static std::ostream &operator<<(std::ostream& o, const QString &s) { - o << s.toLocal8Bit().data(); + o << s; return o; } #endif @@ -182,7 +182,7 @@ for (unsigned int i = 0; i < m_controlPortsIn.size(); ++i) { if (id == m_descriptor->LADSPA_Plugin->PortNames[m_controlPortsIn[i].first]) { #ifdef DEBUG_DSSI - std::cerr << "Matches port " << i << std::endl; + cerr << "Matches port " << i << endl; #endif float v = getParameterValue(i); #ifdef DEBUG_DSSI @@ -250,7 +250,7 @@ if (!strcmp(descriptor->PortNames[i], "latency") || !strcmp(descriptor->PortNames[i], "_latency")) { #ifdef DEBUG_DSSI - std::cerr << "Wooo! We have a latency port!" << std::endl; + cerr << "Wooo! We have a latency port!" << endl; #endif m_latencyPort = data; } @@ -458,15 +458,15 @@ if (!m_descriptor) return; #ifdef DEBUG_DSSI - std::cout << "DSSIPluginInstance::instantiate - plugin \"unique\" id = " - << m_descriptor->LADSPA_Plugin->UniqueID << std::endl; + cout << "DSSIPluginInstance::instantiate - plugin \"unique\" id = " + << m_descriptor->LADSPA_Plugin->UniqueID << endl; #endif const LADSPA_Descriptor *descriptor = m_descriptor->LADSPA_Plugin; if (!descriptor->instantiate) { - std::cerr << "Bad plugin: plugin id " << descriptor->UniqueID + cerr << "Bad plugin: plugin id " << descriptor->UniqueID << ":" << descriptor->Label - << " has no instantiate method!" << std::endl; + << " has no instantiate method!" << endl; return; } @@ -897,7 +897,7 @@ qm = qm + message; free(message); - std::cerr << "DSSIPluginInstance::configure: warning: configure returned message: \"" << qm << "\"" << std::endl; + cerr << "DSSIPluginInstance::configure: warning: configure returned message: \"" << qm << "\"" << endl; } return qm; @@ -918,7 +918,7 @@ if (m_haveLastEventSendTime && m_lastEventSendTime > eventTime) { #ifdef DEBUG_DSSI_PROCESS - std::cerr << "... clearing down" << std::endl; + cerr << "... clearing down" << endl; #endif m_haveLastEventSendTime = false; clearEvents(); @@ -1046,7 +1046,7 @@ #ifdef DEBUG_DSSI_PROCESS 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; + cerr << "Type: " << int(ev->type) << ", pitch: " << int(ev->data.note.note) << ", velocity: " << int(ev->data.note.velocity) << endl; #endif if (frameOffset >= int(count)) break; @@ -1100,8 +1100,8 @@ #ifdef DEBUG_DSSI_PROCESS // for (int i = 0; i < count; ++i) { -// std::cout << m_outputBuffers[0][i] << " "; -// if (i % 8 == 0) std::cout << std::endl; +// cout << m_outputBuffers[0][i] << " "; +// if (i % 8 == 0) cout << endl; // } #endif @@ -1321,10 +1321,10 @@ if (!m_descriptor) return; if (!m_descriptor->LADSPA_Plugin->cleanup) { - std::cerr << "Bad plugin: plugin id " + cerr << "Bad plugin: plugin id " << m_descriptor->LADSPA_Plugin->UniqueID << ":" << m_descriptor->LADSPA_Plugin->Label - << " has no cleanup method!" << std::endl; + << " has no cleanup method!" << endl; return; }
--- a/plugin/FeatureExtractionPluginFactory.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/plugin/FeatureExtractionPluginFactory.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -95,7 +95,7 @@ if (factory) { std::vector<QString> tmp = factory->getPluginIdentifiers(); for (size_t i = 0; i < tmp.size(); ++i) { -// std::cerr << "identifier: " << tmp[i] << std::endl; +// cerr << "identifier: " << tmp[i] << endl; rv.push_back(tmp[i]); } } @@ -135,7 +135,7 @@ void *libraryHandle = DLOPEN(soname, RTLD_LAZY | RTLD_LOCAL); if (!libraryHandle) { - std::cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Failed to load library " << soname << ": " << DLERROR() << std::endl; + cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Failed to load library " << soname << ": " << DLERROR() << endl; continue; } @@ -147,9 +147,9 @@ DLSYM(libraryHandle, "vampGetPluginDescriptor"); if (!fn) { - std::cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: No descriptor function in " << soname << std::endl; + cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: No descriptor function in " << soname << endl; if (DLCLOSE(libraryHandle) != 0) { - std::cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Failed to unload library " << soname << std::endl; + cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Failed to unload library " << soname << endl; } continue; } @@ -167,12 +167,12 @@ while ((descriptor = fn(VAMP_API_VERSION, index))) { if (known.find(descriptor->identifier) != known.end()) { - std::cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Plugin library " - << soname.toStdString() + cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Plugin library " + << soname << " returns the same plugin identifier \"" << descriptor->identifier << "\" at indices " << known[descriptor->identifier] << " and " - << index << std::endl; + << index << endl; SVDEBUG << "FeatureExtractionPluginFactory::getPluginIdentifiers: Avoiding this library (obsolete API?)" << endl; ok = false; break; @@ -200,7 +200,7 @@ } if (DLCLOSE(libraryHandle) != 0) { - std::cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Failed to unload library " << soname << std::endl; + cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Failed to unload library " << soname << endl; } } } @@ -317,13 +317,13 @@ QString found = findPluginFile(soname); if (found == "") { - std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to find library file " << soname << std::endl; + cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to find library file " << soname << endl; return 0; } else if (found != soname) { #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE SVDEBUG << "FeatureExtractionPluginFactory::instantiatePlugin: Given library name was " << soname << ", found at " << found << endl; - std::cerr << soname << " -> " << found << std::endl; + cerr << soname << " -> " << found << endl; #endif } @@ -333,7 +333,7 @@ void *libraryHandle = DLOPEN(soname, RTLD_LAZY | RTLD_LOCAL); if (!libraryHandle) { - std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to load library " << soname << ": " << DLERROR() << std::endl; + cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to load library " << soname << ": " << DLERROR() << endl; return 0; } @@ -351,7 +351,7 @@ } if (!descriptor) { - std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to find plugin \"" << label << "\" in library " << soname << std::endl; + cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to find plugin \"" << label << "\" in library " << soname << endl; goto done; } @@ -369,7 +369,7 @@ done: if (!rv) { if (DLCLOSE(libraryHandle) != 0) { - std::cerr << "WARNING: FeatureExtractionPluginFactory::instantiatePlugin: Failed to unload library " << soname << std::endl; + cerr << "WARNING: FeatureExtractionPluginFactory::instantiatePlugin: Failed to unload library " << soname << endl; } } @@ -423,18 +423,18 @@ // SVDEBUG << "LADSPAPluginFactory::generateFallbackCategories: about to open " << (path[i]+ "/" + dir[j]) << endl; if (file.open(QIODevice::ReadOnly)) { -// std::cerr << "...opened" << std::endl; +// cerr << "...opened" << endl; QTextStream stream(&file); QString line; while (!stream.atEnd()) { line = stream.readLine(); -// std::cerr << "line is: \"" << line << "\"" << std::endl; +// cerr << "line is: \"" << line << "\"" << endl; QString id = PluginIdentifier::canonicalise (line.section("::", 0, 0)); QString cat = line.section("::", 1, 1); m_taxonomy[id] = cat; -// std::cerr << "FeatureExtractionPluginFactory: set id \"" << id << "\" to cat \"" << cat << "\"" << std::endl; +// cerr << "FeatureExtractionPluginFactory: set id \"" << id << "\" to cat \"" << cat << "\"" << endl; } } }
--- a/plugin/LADSPAPluginFactory.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/plugin/LADSPAPluginFactory.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -80,7 +80,7 @@ const LADSPA_Descriptor *descriptor = getLADSPADescriptor(*i); if (!descriptor) { - std::cerr << "WARNING: LADSPAPluginFactory::enumeratePlugins: couldn't get descriptor for identifier " << i->toStdString() << std::endl; + cerr << "WARNING: LADSPAPluginFactory::enumeratePlugins: couldn't get descriptor for identifier " << *i << endl; continue; } @@ -94,11 +94,11 @@ list.push_back("false"); // is grouped if (m_taxonomy.find(*i) != m_taxonomy.end() && m_taxonomy[*i] != "") { -// std::cerr << "LADSPAPluginFactory: cat for " << i->toStdString()<< " found in taxonomy as " << m_taxonomy[descriptor->UniqueID] << std::endl; +// cerr << "LADSPAPluginFactory: cat for " << *i << " found in taxonomy as " << m_taxonomy[descriptor->UniqueID] << endl; list.push_back(m_taxonomy[*i]); } else { list.push_back(""); -// std::cerr << "LADSPAPluginFactory: cat for " << i->toStdString() << " not found (despite having " << m_fallbackCategories.size() << " fallbacks)" << std::endl; +// cerr << "LADSPAPluginFactory: cat for " << *i << " not found (despite having " << m_fallbackCategories.size() << " fallbacks)" << endl; } @@ -366,8 +366,8 @@ Profiler profiler("LADSPAPluginFactory::releasePlugin"); if (m_instances.find(instance) == m_instances.end()) { - std::cerr << "WARNING: LADSPAPluginFactory::releasePlugin: Not one of mine!" - << std::endl; + cerr << "WARNING: LADSPAPluginFactory::releasePlugin: Not one of mine!" + << endl; return; } @@ -415,7 +415,7 @@ if (m_libraryHandles.find(soname) == m_libraryHandles.end()) { loadLibrary(soname); if (m_libraryHandles.find(soname) == m_libraryHandles.end()) { - std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: loadLibrary failed for " << soname << std::endl; + cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: loadLibrary failed for " << soname << endl; return 0; } } @@ -426,7 +426,7 @@ DLSYM(libraryHandle, "ladspa_descriptor"); if (!fn) { - std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: No descriptor function in library " << soname << std::endl; + cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: No descriptor function in library " << soname << endl; return 0; } @@ -438,7 +438,7 @@ ++index; } - std::cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: No such plugin as " << label << " in library " << soname << std::endl; + cerr << "WARNING: LADSPAPluginFactory::getLADSPADescriptor: No such plugin as " << label << " in library " << soname << endl; return 0; } @@ -455,7 +455,7 @@ if (QFileInfo(soName).exists()) { DLERROR(); - std::cerr << "LADSPAPluginFactory::loadLibrary: Library \"" << soName << "\" exists, but failed to load it" << std::endl; + cerr << "LADSPAPluginFactory::loadLibrary: Library \"" << soName << "\" exists, but failed to load it" << endl; return; } @@ -477,7 +477,7 @@ if (QFileInfo(dir.filePath(fileName)).exists()) { #ifdef DEBUG_LADSPA_PLUGIN_FACTORY - std::cerr << "Loading: " << fileName << std::endl; + cerr << "Loading: " << fileName << endl; #endif libraryHandle = DLOPEN(dir.filePath(fileName), RTLD_NOW); if (libraryHandle) { @@ -490,7 +490,7 @@ QString file = dir.filePath(dir[j]); if (QFileInfo(file).baseName() == base) { #ifdef DEBUG_LADSPA_PLUGIN_FACTORY - std::cerr << "Loading: " << file << std::endl; + cerr << "Loading: " << file << endl; #endif libraryHandle = DLOPEN(file, RTLD_NOW); if (libraryHandle) { @@ -501,7 +501,7 @@ } } - std::cerr << "LADSPAPluginFactory::loadLibrary: Failed to locate plugin library \"" << soName << "\"" << std::endl; + cerr << "LADSPAPluginFactory::loadLibrary: Failed to locate plugin library \"" << soName << "\"" << endl; } void @@ -653,7 +653,7 @@ QDir dir(lrdfPaths[i], "*.rdf;*.rdfs"); for (unsigned int j = 0; j < dir.count(); ++j) { if (!lrdf_read_file(QString("file:" + lrdfPaths[i] + "/" + dir[j]).toStdString().c_str())) { -// std::cerr << "LADSPAPluginFactory: read RDF file " << (lrdfPaths[i] + "/" + dir[j]) << std::endl; +// cerr << "LADSPAPluginFactory: read RDF file " << (lrdfPaths[i] + "/" + dir[j]) << endl; haveSomething = true; } } @@ -683,8 +683,8 @@ void *libraryHandle = DLOPEN(soname, RTLD_LAZY); if (!libraryHandle) { - std::cerr << "WARNING: LADSPAPluginFactory::discoverPlugins: couldn't load plugin library " - << soname << " - " << DLERROR() << std::endl; + cerr << "WARNING: LADSPAPluginFactory::discoverPlugins: couldn't load plugin library " + << soname << " - " << DLERROR() << endl; return; } @@ -692,7 +692,7 @@ DLSYM(libraryHandle, "ladspa_descriptor"); if (!fn) { - std::cerr << "WARNING: LADSPAPluginFactory::discoverPlugins: No descriptor function in " << soname << std::endl; + cerr << "WARNING: LADSPAPluginFactory::discoverPlugins: No descriptor function in " << soname << endl; return; } @@ -722,8 +722,8 @@ if (m_lrdfTaxonomy[descriptor->UniqueID] != "") { m_taxonomy[identifier] = m_lrdfTaxonomy[descriptor->UniqueID]; -// std::cerr << "set id \"" << identifier << "\" to cat \"" << m_taxonomy[identifier] << "\" from LRDF" << std::endl; -// std::cout << identifier << "::" << m_taxonomy[identifier] << std::endl; +// cerr << "set id \"" << identifier << "\" to cat \"" << m_taxonomy[identifier] << "\" from LRDF" << endl; +// cout << identifier << "::" << m_taxonomy[identifier] << endl; } QString category = m_taxonomy[identifier]; @@ -739,11 +739,11 @@ rtd->category = category.toStdString(); -// std::cerr << "Plugin id is " << descriptor->UniqueID +// cerr << "Plugin id is " << descriptor->UniqueID // << ", category is \"" << (category ? category : QString("(none)")) // << "\", name is " << descriptor->Name // << ", label is " << descriptor->Label -// << std::endl; +// << endl; def_uri = lrdf_get_default_uri(descriptor->UniqueID); if (def_uri) { @@ -760,7 +760,7 @@ for (unsigned int j = 0; j < defs->count; j++) { if (defs->items[j].pid == controlPortNumber) { -// std::cerr << "Default for this port (" << defs->items[j].pid << ", " << defs->items[j].label << ") is " << defs->items[j].value << "; applying this to port number " << i << " with name " << descriptor->PortNames[i] << std::endl; +// cerr << "Default for this port (" << defs->items[j].pid << ", " << defs->items[j].label << ") is " << defs->items[j].value << "; applying this to port number " << i << " with name " << descriptor->PortNames[i] << endl; m_portDefaults[descriptor->UniqueID][i] = defs->items[j].value; } @@ -801,7 +801,7 @@ } if (DLCLOSE(libraryHandle) != 0) { - std::cerr << "WARNING: LADSPAPluginFactory::discoverPlugins - can't unload " << libraryHandle << std::endl; + cerr << "WARNING: LADSPAPluginFactory::discoverPlugins - can't unload " << libraryHandle << endl; return; } } @@ -836,18 +836,18 @@ // SVDEBUG << "LADSPAPluginFactory::generateFallbackCategories: about to open " << (path[i]+ "/" + dir[j]) << endl; if (file.open(QIODevice::ReadOnly)) { -// std::cerr << "...opened" << std::endl; +// cerr << "...opened" << endl; QTextStream stream(&file); QString line; while (!stream.atEnd()) { line = stream.readLine(); -// std::cerr << "line is: \"" << line << "\"" << std::endl; +// cerr << "line is: \"" << line << "\"" << endl; QString id = PluginIdentifier::canonicalise (line.section("::", 0, 0)); QString cat = line.section("::", 1, 1); m_taxonomy[id] = cat; -// std::cerr << "set id \"" << id << "\" to cat \"" << cat << "\"" << std::endl; +// cerr << "set id \"" << id << "\" to cat \"" << cat << "\"" << endl; } } }
--- a/plugin/LADSPAPluginInstance.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/plugin/LADSPAPluginInstance.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -264,7 +264,7 @@ if (!strcmp(m_descriptor->PortNames[i], "latency") || !strcmp(m_descriptor->PortNames[i], "_latency")) { #ifdef DEBUG_LADSPA - std::cerr << "Wooo! We have a latency port!" << std::endl; + cerr << "Wooo! We have a latency port!" << endl; #endif m_latencyPort = data; } @@ -382,14 +382,14 @@ if (!m_descriptor) return; #ifdef DEBUG_LADSPA - std::cout << "LADSPAPluginInstance::instantiate - plugin unique id = " - << m_descriptor->UniqueID << std::endl; + cout << "LADSPAPluginInstance::instantiate - plugin unique id = " + << m_descriptor->UniqueID << endl; #endif if (!m_descriptor->instantiate) { - std::cerr << "Bad plugin: plugin id " << m_descriptor->UniqueID + cerr << "Bad plugin: plugin id " << m_descriptor->UniqueID << ":" << m_descriptor->Label - << " has no instantiate method!" << std::endl; + << " has no instantiate method!" << endl; return; } @@ -562,9 +562,9 @@ if (!m_descriptor) return; if (!m_descriptor->cleanup) { - std::cerr << "Bad plugin: plugin id " << m_descriptor->UniqueID + cerr << "Bad plugin: plugin id " << m_descriptor->UniqueID << ":" << m_descriptor->Label - << " has no cleanup method!" << std::endl; + << " has no cleanup method!" << endl; return; }
--- a/plugin/PluginXml.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/plugin/PluginXml.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -117,10 +117,10 @@ #define CHECK_ATTRIBUTE(ATTRIBUTE, ACCESSOR) \ QString ATTRIBUTE = attrs.value(#ATTRIBUTE); \ if (ATTRIBUTE != "" && ATTRIBUTE != ACCESSOR().c_str()) { \ - std::cerr << "WARNING: PluginXml::setParameters: Plugin " \ + cerr << "WARNING: PluginXml::setParameters: Plugin " \ << #ATTRIBUTE << " does not match (attributes have \"" \ << ATTRIBUTE << "\", my " \ - << #ATTRIBUTE << " is \"" << ACCESSOR() << "\")" << std::endl; \ + << #ATTRIBUTE << " is \"" << ACCESSOR() << "\")" << endl; \ } void @@ -135,7 +135,7 @@ bool ok; int version = attrs.value("version").trimmed().toInt(&ok); if (ok && version != m_plugin->getPluginVersion()) { - std::cerr << "WARNING: PluginXml::setParameters: Plugin version does not match (attributes have " << version << ", my version is " << m_plugin->getPluginVersion() << ")" << std::endl; + cerr << "WARNING: PluginXml::setParameters: Plugin version does not match (attributes have " << version << ", my version is " << m_plugin->getPluginVersion() << ")" << endl; } RealTimePluginInstance *rtpi = @@ -148,7 +148,7 @@ i != configList.end(); ++i) { QStringList kv = i->split("="); if (kv.count() < 2) { - std::cerr << "WARNING: PluginXml::setParameters: Malformed configure pair string: \"" << i->toStdString() << "\"" << std::endl; + cerr << "WARNING: PluginXml::setParameters: Malformed configure pair string: \"" << *i << "\"" << endl; continue; } QString key(kv[0]), value(kv[1]); @@ -185,7 +185,7 @@ // << i->identifier << "\" to value " << value << endl; m_plugin->setParameter(i->identifier, value); } else { - std::cerr << "WARNING: PluginXml::setParameters: Invalid value \"" << attrs.value(pname) << "\" for parameter \"" << i->identifier << "\" (attribute \"" << pname << "\")" << std::endl; + cerr << "WARNING: PluginXml::setParameters: Invalid value \"" << attrs.value(pname) << "\" for parameter \"" << i->identifier << "\" (attribute \"" << pname << "\")" << endl; } } } @@ -200,13 +200,13 @@ int errorColumn; // SVDEBUG << "PluginXml::setParametersFromXml: XML is \"" -// << xml.toLocal8Bit().data() << "\"" << endl; +// << xml << "\"" << endl; if (!doc.setContent(xml, false, &error, &errorLine, &errorColumn)) { - std::cerr << "PluginXml::setParametersFromXml: Error in parsing XML: " << error << " at line " << errorLine << ", column " << errorColumn << std::endl; - std::cerr << "Input follows:" << std::endl; - std::cerr << xml << std::endl; - std::cerr << "Input ends." << std::endl; + cerr << "PluginXml::setParametersFromXml: Error in parsing XML: " << error << " at line " << errorLine << ", column " << errorColumn << endl; + cerr << "Input follows:" << endl; + cerr << xml << endl; + cerr << "Input ends." << endl; return; }
--- a/plugin/plugins/SamplePlayer.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/plugin/plugins/SamplePlayer.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -366,7 +366,7 @@ #ifdef DEBUG_SAMPLE_PLAYER SVDEBUG << "SamplePlayer::searchSamples: Directory is \"" - << m_sampleDir.toLocal8Bit().data() << "\"" << endl; + << m_sampleDir << "\"" << endl; #endif QDir dir(m_sampleDir, "*.wav"); @@ -377,7 +377,7 @@ m_samples.push_back(std::pair<QString, QString> (file.baseName(), file.filePath())); #ifdef DEBUG_SAMPLE_PLAYER - std::cerr << "Found: " << dir[i].toLocal8Bit().data() << std::endl; + cerr << "Found: " << dir[i] << endl; #endif } } @@ -397,9 +397,9 @@ info.format = 0; file = sf_open(path.toLocal8Bit().data(), SFM_READ, &info); if (!file) { - std::cerr << "SamplePlayer::loadSampleData: Failed to open file " - << path.toLocal8Bit().data() << ": " - << sf_strerror(file) << std::endl; + cerr << "SamplePlayer::loadSampleData: Failed to open file " + << path << ": " + << sf_strerror(file) << endl; return; } @@ -505,8 +505,8 @@ if (events[event_pos].type == SND_SEQ_EVENT_NOTEON) { #ifdef DEBUG_SAMPLE_PLAYER - std::cerr << "SamplePlayer: found NOTEON at time " - << events[event_pos].time.tick << std::endl; + cerr << "SamplePlayer: found NOTEON at time " + << events[event_pos].time.tick << endl; #endif snd_seq_ev_note_t n = events[event_pos].data.note; if (n.velocity > 0) { @@ -523,8 +523,8 @@ } else if (events[event_pos].type == SND_SEQ_EVENT_NOTEOFF && (!m_sustain || (*m_sustain < 0.001))) { #ifdef DEBUG_SAMPLE_PLAYER - std::cerr << "SamplePlayer: found NOTEOFF at time " - << events[event_pos].time.tick << std::endl; + cerr << "SamplePlayer: found NOTEOFF at time " + << events[event_pos].time.tick << endl; #endif snd_seq_ev_note_t n = events[event_pos].data.note; m_offs[n.note] = @@ -550,7 +550,7 @@ } #ifdef DEBUG_SAMPLE_PLAYER - std::cerr << "SamplePlayer: have " << notecount << " note(s) sounding currently" << std::endl; + cerr << "SamplePlayer: have " << notecount << " note(s) sounding currently" << endl; #endif pos += count; @@ -590,7 +590,7 @@ if (rsi >= m_sampleCount) { #ifdef DEBUG_SAMPLE_PLAYER - std::cerr << "Note " << n << " has run out of samples (were " << m_sampleCount << " available at ratio " << ratio << "), ending" << std::endl; + cerr << "Note " << n << " has run out of samples (were " << m_sampleCount << " available at ratio " << ratio << "), ending" << endl; #endif m_ons[n] = -1; break; @@ -609,7 +609,7 @@ if (dist > releaseFrames) { #ifdef DEBUG_SAMPLE_PLAYER - std::cerr << "Note " << n << " has expired its release time (" << releaseFrames << " frames), ending" << std::endl; + cerr << "Note " << n << " has expired its release time (" << releaseFrames << " frames), ending" << endl; #endif m_ons[n] = -1; break;
--- a/rdf/PluginRDFDescription.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/rdf/PluginRDFDescription.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -24,8 +24,6 @@ #include <dataquay/BasicStore.h> #include <iostream> -using std::cerr; -using std::endl; using Dataquay::Uri; using Dataquay::Node;
--- a/rdf/PluginRDFIndexer.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/rdf/PluginRDFIndexer.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -35,8 +35,7 @@ #include <QFile> #include <iostream> -using std::cerr; -using std::endl; + using std::vector; using std::string; using Vamp::PluginHostAdapter; @@ -85,7 +84,7 @@ { vector<string> paths = PluginHostAdapter::getPluginPath(); -// std::cerr << "\nPluginRDFIndexer::indexInstalledURLs: pid is " << getpid() << std::endl; +// cerr << "\nPluginRDFIndexer::indexInstalledURLs: pid is " << getpid() << endl; QStringList filters; filters << "*.ttl"; @@ -167,7 +166,7 @@ for (PlaylistFileReader::Playlist::const_iterator j = list.begin(); j != list.end(); ++j) { SVDEBUG << "PluginRDFIndexer::indexConfiguredURLs: url is " - << j->toStdString() << endl; + << *j << endl; pullURL(*j); } } @@ -262,7 +261,7 @@ { Profiler profiler("PluginRDFIndexer::indexURL"); -// std::cerr << "PluginRDFIndexer::indexURL(" << urlString.toStdString() << ")" << std::endl; +// cerr << "PluginRDFIndexer::indexURL(" << urlString << ")" << endl; QMutexLocker locker(&m_mutex);
--- a/rdf/RDFFeatureWriter.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/rdf/RDFFeatureWriter.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -263,7 +263,7 @@ // dirty grubby low-rent way of doing that. This function is // called by FileFeatureWriter::getOutputFile when in append mode. -// std::cerr << "reviewFileForAppending(" << filename << ")" << std::endl; +// cerr << "reviewFileForAppending(" << filename << ")" << endl; QFile file(filename);
--- a/rdf/RDFImporter.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/rdf/RDFImporter.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -47,9 +47,6 @@ using Dataquay::BasicStore; using Dataquay::PropertyObject; -using std::cerr; -using std::endl; - class RDFImporterImpl { public: @@ -180,7 +177,7 @@ if (m_sampleRate == 0) { m_errorString = QString("Invalid audio data model (is audio file format supported?)"); - std::cerr << m_errorString << std::endl; + cerr << m_errorString << endl; return models; } @@ -221,7 +218,7 @@ file = m_store->complete(Triple(sig, expand("mo:available_as"), Node())); } if (file == Node()) { - std::cerr << "RDFImporterImpl::getDataModelsAudio: ERROR: No source for signal " << sig << std::endl; + cerr << "RDFImporterImpl::getDataModelsAudio: ERROR: No source for signal " << sig << endl; continue; } @@ -254,8 +251,8 @@ fs->getLocation(), m_uristring); if (path != "") { - std::cerr << "File finder returns: \"" << path.toStdString() - << "\"" << std::endl; + cerr << "File finder returns: \"" << path + << "\"" << endl; delete fs; fs = new FileSource(path, reporter); if (!fs->isAvailable()) { @@ -274,7 +271,7 @@ fs->waitForData(); WaveFileModel *newModel = new WaveFileModel(*fs, m_sampleRate); if (newModel->isOK()) { - std::cerr << "Successfully created wave file model from source at \"" << source << "\"" << std::endl; + cerr << "Successfully created wave file model from source at \"" << source << "\"" << endl; models.push_back(newModel); m_audioModelMap[signal] = newModel; if (m_sampleRate == 0) { @@ -669,7 +666,7 @@ model->setRDFTypeURI(type); if (m_audioModelMap.find(source) != m_audioModelMap.end()) { - std::cerr << "source model for " << model << " is " << m_audioModelMap[source] << std::endl; + cerr << "source model for " << model << " is " << m_audioModelMap[source] << endl; model->setSourceModel(m_audioModelMap[source]); } @@ -798,7 +795,7 @@ return; } - std::cerr << "WARNING: RDFImporterImpl::fillModel: Unknown or unexpected model type" << std::endl; + cerr << "WARNING: RDFImporterImpl::fillModel: Unknown or unexpected model type" << endl; return; }
--- a/rdf/RDFTransformFactory.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/rdf/RDFTransformFactory.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -34,9 +34,6 @@ #include <dataquay/BasicStore.h> #include <dataquay/PropertyObject.h> -using std::cerr; -using std::endl; - using Dataquay::Uri; using Dataquay::Node; using Dataquay::Nodes; @@ -371,7 +368,7 @@ s << uri << " a vamp:Transform ;" << endl; s << " vamp:plugin <" << QUrl(pluginUri).toEncoded().data() << "> ;" << endl; } else { - std::cerr << "WARNING: RDFTransformFactory::writeTransformToRDF: No plugin URI available for plugin id \"" << pluginId << "\", writing synthetic plugin and library resources" << std::endl; + cerr << "WARNING: RDFTransformFactory::writeTransformToRDF: No plugin URI available for plugin id \"" << pluginId << "\", writing synthetic plugin and library resources" << endl; QString type, soname, label; PluginIdentifier::parseIdentifier(pluginId, type, soname, label); s << uri << "_plugin a vamp:Plugin ;" << endl; @@ -388,7 +385,7 @@ QString outputUri = description.getOutputUri(outputId); if (transform.getOutput() != "" && outputUri == "") { - std::cerr << "WARNING: RDFTransformFactory::writeTransformToRDF: No output URI available for transform output id \"" << transform.getOutput() << "\", writing a synthetic output resource" << std::endl; + cerr << "WARNING: RDFTransformFactory::writeTransformToRDF: No output URI available for transform output id \"" << transform.getOutput() << "\", writing a synthetic output resource" << endl; } if (transform.getStepSize() != 0) {
--- a/rdf/SimpleSPARQLQuery.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/rdf/SimpleSPARQLQuery.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -34,8 +34,8 @@ #include <iostream> -using std::cerr; -using std::endl; +using cerr; +using endl; class WredlandWorldWrapper { @@ -83,16 +83,16 @@ m_defaultStorage = librdf_new_storage(m_world, "trees", NULL, NULL); if (!m_defaultStorage) { - std::cerr << "SimpleSPARQLQuery: WARNING: Failed to initialise Redland trees datastore, falling back to memory store" << std::endl; + cerr << "SimpleSPARQLQuery: WARNING: Failed to initialise Redland trees datastore, falling back to memory store" << endl; m_defaultStorage = librdf_new_storage(m_world, NULL, NULL, NULL); if (!m_defaultStorage) { - std::cerr << "SimpleSPARQLQuery: ERROR: Failed to initialise Redland memory datastore" << std::endl; + cerr << "SimpleSPARQLQuery: ERROR: Failed to initialise Redland memory datastore" << endl; return; } } m_defaultModel = librdf_new_model(m_world, m_defaultStorage, NULL); if (!m_defaultModel) { - std::cerr << "SimpleSPARQLQuery: ERROR: Failed to initialise Redland data model" << std::endl; + cerr << "SimpleSPARQLQuery: ERROR: Failed to initialise Redland data model" << endl; return; } } @@ -156,13 +156,13 @@ } librdf_model *model = librdf_new_model(m_world, storage, NULL); if (!model) { - std::cerr << "SimpleSPARQLQuery: ERROR: Failed to create new model" << std::endl; + cerr << "SimpleSPARQLQuery: ERROR: Failed to create new model" << endl; librdf_free_storage(storage); return 0; } QString err; if (!loadUri(model, fromUri, err)) { - std::cerr << "SimpleSPARQLQuery: ERROR: Failed to parse into new model: " << err << std::endl; + cerr << "SimpleSPARQLQuery: ERROR: Failed to parse into new model: " << err << endl; librdf_free_model(model); librdf_free_storage(storage); m_ownModelUris[fromUri] = 0; @@ -220,7 +220,7 @@ } #ifdef DEBUG_SIMPLE_SPARQL_QUERY - std::cerr << "About to parse \"" << uri << "\"" << std::endl; + cerr << "About to parse \"" << uri << "\"" << endl; #endif Profiler p("SimpleSPARQLQuery: Parse URI into LIBRDF model"); @@ -377,8 +377,8 @@ #ifdef DEBUG_SIMPLE_SPARQL_QUERY if (m_errorString != "") { - std::cerr << "SimpleSPARQLQuery::execute: error returned: \"" - << m_errorString << "\"" << std::endl; + cerr << "SimpleSPARQLQuery::execute: error returned: \"" + << m_errorString << "\"" << endl; } #endif } @@ -435,8 +435,8 @@ static std::map<QString, int> counter; if (counter.find(m_query) == counter.end()) counter[m_query] = 1; else ++counter[m_query]; - std::cerr << "Counter for this query: " << counter[m_query] << std::endl; - std::cerr << "Base URI is: \"" << modelUri << "\"" << std::endl; + cerr << "Counter for this query: " << counter[m_query] << endl; + cerr << "Base URI is: \"" << modelUri << "\"" << endl; #endif { @@ -486,7 +486,7 @@ librdf_query_results_get_binding_name(results, i); if (!name) { - std::cerr << "WARNING: Result " << i << " of query has no name" << std::endl; + cerr << "WARNING: Result " << i << " of query has no name" << endl; continue; } @@ -497,7 +497,7 @@ if (!node) { #ifdef DEBUG_SIMPLE_SPARQL_QUERY - std::cerr << i << ". " << key << " -> (nil)" << std::endl; + cerr << i << ". " << key << " -> (nil)" << endl; #endif resultmap[key] = Value(); continue; @@ -513,7 +513,7 @@ const char *us = (const char *)librdf_uri_as_string(uri); if (!us) { - std::cerr << "WARNING: Result " << i << " of query claims URI type, but has null URI" << std::endl; + cerr << "WARNING: Result " << i << " of query claims URI type, but has null URI" << endl; } else { text = us; } @@ -524,7 +524,7 @@ const char *lit = (const char *)librdf_node_get_literal_value(node); if (!lit) { - std::cerr << "WARNING: Result " << i << " of query claims literal type, but has no literal" << std::endl; + cerr << "WARNING: Result " << i << " of query claims literal type, but has no literal" << endl; } else { text = lit; } @@ -593,12 +593,12 @@ } if (!m_redland->isOK()) { - std::cerr << "SimpleSPARQLQuery::addSourceToModel: Failed to initialise Redland datastore" << std::endl; + cerr << "SimpleSPARQLQuery::addSourceToModel: Failed to initialise Redland datastore" << endl; return false; } if (!m_redland->loadUriIntoDefaultModel(sourceUri, err)) { - std::cerr << "SimpleSPARQLQuery::addSourceToModel: Failed to add source URI \"" << sourceUri << ": " << err << std::endl; + cerr << "SimpleSPARQLQuery::addSourceToModel: Failed to add source URI \"" << sourceUri << ": " << err << endl; return false; } return true;
--- a/system/Init.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/system/Init.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -17,7 +17,7 @@ #include <qglobal.h> -#ifdef Q_WS_WIN32 +#ifdef Q_OS_WIN32 #include <fcntl.h> @@ -57,7 +57,7 @@ extern void svSystemSpecificInitialisation() { -#ifdef Q_WS_WIN32 +#ifdef Q_OS_WIN32 redirectStderr(); // Remove the CWD from the DLL search path, just in case
--- a/system/System.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/system/System.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -155,8 +155,8 @@ lMEMORYSTATUSEX lms; lms.dwLength = sizeof(lms); if (!ex(&lms)) { - std::cerr << "WARNING: GlobalMemoryStatusEx failed: error code " - << GetLastError() << std::endl; + cerr << "WARNING: GlobalMemoryStatusEx failed: error code " + << GetLastError() << endl; return; } wavail = lms.ullAvailPhys; @@ -220,8 +220,8 @@ QString unit = "kB"; if (elements.size() > 2) unit = elements[2]; int size = elements[1].toInt(); -// std::cerr << "have size \"" << size << "\", unit \"" -// << unit << "\"" << std::endl; +// cerr << "have size \"" << size << "\", unit \"" +// << unit << "\"" << endl; if (unit.toLower() == "gb") size = size * 1024; else if (unit.toLower() == "mb") size = size; else if (unit.toLower() == "kb") size = size / 1024; @@ -254,8 +254,8 @@ if (a > INT_MAX) a = INT_MAX; return int(a); } else { - std::cerr << "WARNING: GetDiskFreeSpaceEx failed: error code " - << GetLastError() << std::endl; + cerr << "WARNING: GetDiskFreeSpaceEx failed: error code " + << GetLastError() << endl; return -1; } #else @@ -263,7 +263,7 @@ if (!statvfs(path, &buf)) { // do the multiplies and divides in this order to reduce the // likelihood of arithmetic overflow -// std::cerr << "statvfs(" << path << ") says available: " << buf.f_bavail << ", block size: " << buf.f_bsize << std::endl; +// cerr << "statvfs(" << path << ") says available: " << buf.f_bavail << ", block size: " << buf.f_bsize << endl; uint64_t available = ((buf.f_bavail / 1024) * buf.f_bsize) / 1024; if (available > INT_MAX) available = INT_MAX; return int(available);
--- a/transform/FeatureExtractionModelTransformer.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/transform/FeatureExtractionModelTransformer.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -180,7 +180,7 @@ { DenseTimeValueModel *input = getConformingInput(); -// std::cerr << "FeatureExtractionModelTransformer::createOutputModel: sample type " << m_descriptor->sampleType << ", rate " << m_descriptor->sampleRate << std::endl; +// cerr << "FeatureExtractionModelTransformer::createOutputModel: sample type " << m_descriptor->sampleType << ", rate " << m_descriptor->sampleRate << endl; PluginRDFDescription description(m_transform.getPluginIdentifier()); QString outputId = m_transform.getOutput(); @@ -193,8 +193,8 @@ binCount = m_descriptor->binCount; } -// std::cerr << "FeatureExtractionModelTransformer: output bin count " -// << binCount << std::endl; +// cerr << "FeatureExtractionModelTransformer: output bin count " +// << binCount << endl; if (binCount > 0 && m_descriptor->hasKnownExtents) { minValue = m_descriptor->minValue; @@ -208,8 +208,8 @@ if (m_descriptor->sampleType != Vamp::Plugin::OutputDescriptor::OneSamplePerStep) { if (m_descriptor->sampleRate > input->getSampleRate()) { - std::cerr << "WARNING: plugin reports output sample rate as " - << m_descriptor->sampleRate << " (can't display features with finer resolution than the input rate of " << input->getSampleRate() << ")" << std::endl; + cerr << "WARNING: plugin reports output sample rate as " + << m_descriptor->sampleRate << " (can't display features with finer resolution than the input rate of " << input->getSampleRate() << ")" << endl; } } @@ -540,7 +540,7 @@ } error = fftModels[ch]->getError(); if (error != "") { - std::cerr << "FeatureExtractionModelTransformer::run: Abandoning, error is " << error << std::endl; + cerr << "FeatureExtractionModelTransformer::run: Abandoning, error is " << error << endl; m_abandoned = true; m_message = error; } @@ -655,11 +655,11 @@ { size_t inputRate = m_input.getModel()->getSampleRate(); -// std::cerr << "FeatureExtractionModelTransformer::addFeature: blockFrame = " +// cerr << "FeatureExtractionModelTransformer::addFeature: blockFrame = " // << blockFrame << ", hasTimestamp = " << feature.hasTimestamp // << ", timestamp = " << feature.timestamp << ", hasDuration = " // << feature.hasDuration << ", duration = " << feature.duration -// << std::endl; +// << endl; int binCount = 1; if (m_descriptor->hasFixedBinCount) { @@ -672,10 +672,10 @@ Vamp::Plugin::OutputDescriptor::VariableSampleRate) { if (!feature.hasTimestamp) { - std::cerr + cerr << "WARNING: FeatureExtractionModelTransformer::addFeature: " << "Feature has variable sample rate but no timestamp!" - << std::endl; + << endl; return; } else { frame = Vamp::RealTime::realTime2Frame(feature.timestamp, inputRate);
--- a/transform/FileFeatureWriter.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/transform/FileFeatureWriter.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -276,7 +276,7 @@ if (m_append) mode |= QIODevice::Append; if (!file->open(mode)) { - cerr << "FileFeatureWriter: ERROR: Failed to open output file \"" << filename.toStdString() + cerr << "FileFeatureWriter: ERROR: Failed to open output file \"" << filename << "\" for writing" << endl; delete file; m_files[key] = 0;
--- a/transform/ModelTransformerFactory.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/transform/ModelTransformerFactory.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -87,13 +87,13 @@ bool ok = true; QString configurationXml = m_lastConfigurations[transform.getIdentifier()]; - std::cerr << "last configuration: " << configurationXml << std::endl; + cerr << "last configuration: " << configurationXml << endl; Vamp::PluginBase *plugin = 0; if (FeatureExtractionPluginFactory::instanceFor(id)) { - std::cerr << "getConfigurationForTransform: instantiating Vamp plugin" << std::endl; + cerr << "getConfigurationForTransform: instantiating Vamp plugin" << endl; Vamp::Plugin *vp = FeatureExtractionPluginFactory::instanceFor(id)->instantiatePlugin @@ -242,15 +242,15 @@ // SVDEBUG << "ModelTransformerFactory::transformerFinished(" << transformer << ")" << endl; if (!transformer) { - std::cerr << "WARNING: ModelTransformerFactory::transformerFinished: sender is not a transformer" << std::endl; + cerr << "WARNING: ModelTransformerFactory::transformerFinished: sender is not a transformer" << endl; return; } if (m_runningTransformers.find(transformer) == m_runningTransformers.end()) { - std::cerr << "WARNING: ModelTransformerFactory::transformerFinished(" + cerr << "WARNING: ModelTransformerFactory::transformerFinished(" << transformer << "): I have no record of this transformer running!" - << std::endl; + << endl; } m_runningTransformers.erase(transformer);
--- a/transform/RealTimeEffectModelTransformer.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/transform/RealTimeEffectModelTransformer.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -49,8 +49,8 @@ RealTimePluginFactory::instanceFor(pluginId); if (!factory) { - std::cerr << "RealTimeEffectModelTransformer: No factory available for plugin id \"" - << pluginId << "\"" << std::endl; + cerr << "RealTimeEffectModelTransformer: No factory available for plugin id \"" + << pluginId << "\"" << endl; return; } @@ -63,8 +63,8 @@ input->getChannelCount()); if (!m_plugin) { - std::cerr << "RealTimeEffectModelTransformer: Failed to instantiate plugin \"" - << pluginId << "\"" << std::endl; + cerr << "RealTimeEffectModelTransformer: Failed to instantiate plugin \"" + << pluginId << "\"" << endl; return; } @@ -72,7 +72,7 @@ if (m_outputNo >= 0 && m_outputNo >= int(m_plugin->getControlOutputCount())) { - std::cerr << "RealTimeEffectModelTransformer: Plugin has fewer than desired " << m_outputNo << " control outputs" << std::endl; + cerr << "RealTimeEffectModelTransformer: Plugin has fewer than desired " << m_outputNo << " control outputs" << endl; return; } @@ -216,14 +216,14 @@ } /* - std::cerr << "Input for plugin: " << m_plugin->getAudioInputCount() << " channels "<< std::endl; + cerr << "Input for plugin: " << m_plugin->getAudioInputCount() << " channels "<< endl; for (size_t ch = 0; ch < m_plugin->getAudioInputCount(); ++ch) { - std::cerr << "Input channel " << ch << std::endl; + cerr << "Input channel " << ch << endl; for (size_t i = 0; i < 100; ++i) { - std::cerr << inbufs[ch][i] << " "; + cerr << inbufs[ch][i] << " "; if (isnan(inbufs[ch][i])) { - std::cerr << "\n\nWARNING: NaN in audio input" << std::endl; + cerr << "\n\nWARNING: NaN in audio input" << endl; } } }
--- a/transform/Transform.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/transform/Transform.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -53,12 +53,12 @@ int errorColumn; if (!doc.setContent(xml, false, &error, &errorLine, &errorColumn)) { - std::cerr << "Transform::Transform: Error in parsing XML: " + cerr << "Transform::Transform: Error in parsing XML: " << error << " at line " << errorLine - << ", column " << errorColumn << std::endl; - std::cerr << "Input follows:" << std::endl; - std::cerr << xml << std::endl; - std::cerr << "Input ends." << std::endl; + << ", column " << errorColumn << endl; + cerr << "Input follows:" << endl; + cerr << xml << endl; + cerr << "Input ends." << endl; return; } @@ -125,10 +125,10 @@ m_sampleRate == t.m_sampleRate; /* SVDEBUG << "Transform::operator==: identical = " << identical << endl; - std::cerr << "A = " << std::endl; - std::cerr << toXmlString() << std::endl; - std::cerr << "B = " << std::endl; - std::cerr << t.toXmlString() << std::endl; + cerr << "A = " << endl; + cerr << toXmlString() << endl; + cerr << "B = " << endl; + cerr << t.toXmlString() << endl; */ return identical; }
--- a/transform/TransformFactory.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/transform/TransformFactory.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -39,9 +39,6 @@ //#define DEBUG_TRANSFORM_FACTORY 1 -using std::cerr; -using std::endl; - TransformFactory * TransformFactory::m_instance = new TransformFactory; @@ -416,7 +413,7 @@ FeatureExtractionPluginFactory::instanceFor(pluginId); if (!factory) { - cerr << "WARNING: TransformFactory::populateTransforms: No feature extraction plugin factory for instance " << pluginId.toLocal8Bit().data() << endl; + cerr << "WARNING: TransformFactory::populateTransforms: No feature extraction plugin factory for instance " << pluginId << endl; continue; } @@ -424,7 +421,7 @@ factory->instantiatePlugin(pluginId, 44100); if (!plugin) { - cerr << "WARNING: TransformFactory::populateTransforms: Failed to instantiate plugin " << pluginId.toLocal8Bit().data() << endl; + cerr << "WARNING: TransformFactory::populateTransforms: Failed to instantiate plugin " << pluginId << endl; continue; } @@ -517,7 +514,7 @@ RealTimePluginFactory::instanceFor(pluginId); if (!factory) { - cerr << "WARNING: TransformFactory::populateTransforms: No real time plugin factory for instance " << pluginId.toLocal8Bit().data() << endl; + cerr << "WARNING: TransformFactory::populateTransforms: No real time plugin factory for instance " << pluginId << endl; continue; } @@ -525,14 +522,14 @@ factory->getPluginDescriptor(pluginId); if (!descriptor) { - cerr << "WARNING: TransformFactory::populateTransforms: Failed to query plugin " << pluginId.toLocal8Bit().data() << endl; + cerr << "WARNING: TransformFactory::populateTransforms: Failed to query plugin " << pluginId << endl; continue; } //!!! if (descriptor->controlOutputPortCount == 0 || // descriptor->audioInputPortCount == 0) continue; -// std::cout << "TransformFactory::populateRealTimePlugins: plugin " << pluginId << " has " << descriptor->controlOutputPortCount << " control output ports, " << descriptor->audioOutputPortCount << " audio outputs, " << descriptor->audioInputPortCount << " audio inputs" << endl; +// cout << "TransformFactory::populateRealTimePlugins: plugin " << pluginId << " has " << descriptor->controlOutputPortCount << " control output ports, " << descriptor->audioOutputPortCount << " audio outputs, " << descriptor->audioInputPortCount << " audio inputs" << endl; QString pluginName = descriptor->name.c_str(); QString category = factory->getPluginCategory(pluginId); @@ -747,7 +744,7 @@ m_uninstalledTransformsPopulated = true; #ifdef DEBUG_TRANSFORM_FACTORY - std::cerr << "populateUninstalledTransforms exiting" << std::endl; + cerr << "populateUninstalledTransforms exiting" << endl; #endif } @@ -1154,7 +1151,7 @@ } if (!m_uninstalledTransformsPopulated) { - std::cerr << "WARNING: TransformFactory::search: Uninstalled transforms are not populated yet" << endl + cerr << "WARNING: TransformFactory::search: Uninstalled transforms are not populated yet" << endl << "and are not being populated either -- was the thread not started correctly?" << endl; m_uninstalledTransformsMutex.unlock(); return results;