Mercurial > hg > svcore
diff data/fileio/MIDIFileReader.cpp @ 843:e802e550a1f2
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 13:35:08 +0000 |
parents | 1424aa29ae95 |
children | 59e7fe1b1003 |
line wrap: on
line diff
--- a/data/fileio/MIDIFileReader.cpp Tue Nov 26 11:16:37 2013 +0000 +++ b/data/fileio/MIDIFileReader.cpp Tue Nov 26 13:35:08 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; } }