comparison data/fileio/MIDIFileReader.cpp @ 843:e802e550a1f2

Drop std:: from cout, cerr, endl -- pull these in through Debug.h

 
 #include <QString>
 
 #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;
 using std::map;
 using std::set;

 // Add any tempo events found in the given track to the global tempo map.
 //
 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) {
 
         if ((*i)->isMeta() &&

 	    MIDIByte m1 = (*i)->getMetaMessage()[1];
 	    MIDIByte m2 = (*i)->getMetaMessage()[2];
 	    
 	    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);
 		m_tempoMap[(*i)->getTime()] =
 		    TempoChange(RealTime::zeroTime, qpm);

 
 /*
     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;
 */
 
     return tempoRealTime + RealTime::fromSeconds(seconds);
 }

     NoteModel *model = 0;
 
     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;
 	}
     }
 
     if (!model) {
 	model = new NoteModel(m_mainModelSampleRate, 1, 0.0, 0.0, false);