Mercurial > hg > svcore
comparison 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 |
comparison
equal
deleted
inserted
replaced
842:23d3a6eca5c3 | 843:e802e550a1f2 |
---|---|
37 | 37 |
38 #include <QString> | 38 #include <QString> |
39 | 39 |
40 #include <sstream> | 40 #include <sstream> |
41 | 41 |
42 #include "base/Debug.h" | |
43 | |
42 using std::string; | 44 using std::string; |
43 using std::ifstream; | 45 using std::ifstream; |
44 using std::stringstream; | 46 using std::stringstream; |
45 using std::cerr; | |
46 using std::endl; | |
47 using std::ends; | 47 using std::ends; |
48 using std::ios; | 48 using std::ios; |
49 using std::vector; | 49 using std::vector; |
50 using std::map; | 50 using std::map; |
51 using std::set; | 51 using std::set; |
711 // Add any tempo events found in the given track to the global tempo map. | 711 // Add any tempo events found in the given track to the global tempo map. |
712 // | 712 // |
713 void | 713 void |
714 MIDIFileReader::updateTempoMap(unsigned int track) | 714 MIDIFileReader::updateTempoMap(unsigned int track) |
715 { | 715 { |
716 std::cerr << "updateTempoMap for track " << track << " (" << m_midiComposition[track].size() << " events)" << std::endl; | 716 cerr << "updateTempoMap for track " << track << " (" << m_midiComposition[track].size() << " events)" << endl; |
717 | 717 |
718 for (MIDITrack::iterator i = m_midiComposition[track].begin(); | 718 for (MIDITrack::iterator i = m_midiComposition[track].begin(); |
719 i != m_midiComposition[track].end(); ++i) { | 719 i != m_midiComposition[track].end(); ++i) { |
720 | 720 |
721 if ((*i)->isMeta() && | 721 if ((*i)->isMeta() && |
725 MIDIByte m1 = (*i)->getMetaMessage()[1]; | 725 MIDIByte m1 = (*i)->getMetaMessage()[1]; |
726 MIDIByte m2 = (*i)->getMetaMessage()[2]; | 726 MIDIByte m2 = (*i)->getMetaMessage()[2]; |
727 | 727 |
728 long tempo = (((m0 << 8) + m1) << 8) + m2; | 728 long tempo = (((m0 << 8) + m1) << 8) + m2; |
729 | 729 |
730 std::cerr << "updateTempoMap: have tempo, it's " << tempo << " at " << (*i)->getTime() << std::endl; | 730 cerr << "updateTempoMap: have tempo, it's " << tempo << " at " << (*i)->getTime() << endl; |
731 | 731 |
732 if (tempo != 0) { | 732 if (tempo != 0) { |
733 double qpm = 60000000.0 / double(tempo); | 733 double qpm = 60000000.0 / double(tempo); |
734 m_tempoMap[(*i)->getTime()] = | 734 m_tempoMap[(*i)->getTime()] = |
735 TempoChange(RealTime::zeroTime, qpm); | 735 TempoChange(RealTime::zeroTime, qpm); |
788 | 788 |
789 /* | 789 /* |
790 SVDEBUG << "MIDIFileReader::getTimeForMIDITime(" << midiTime << ")" | 790 SVDEBUG << "MIDIFileReader::getTimeForMIDITime(" << midiTime << ")" |
791 << endl; | 791 << endl; |
792 SVDEBUG << "timing division = " << td << endl; | 792 SVDEBUG << "timing division = " << td << endl; |
793 std::cerr << "nearest tempo event (of " << m_tempoMap.size() << ") is at " << tempoMIDITime << " (" | 793 cerr << "nearest tempo event (of " << m_tempoMap.size() << ") is at " << tempoMIDITime << " (" |
794 << tempoRealTime << ")" << std::endl; | 794 << tempoRealTime << ")" << endl; |
795 std::cerr << "quarters since then = " << quarters << std::endl; | 795 cerr << "quarters since then = " << quarters << endl; |
796 std::cerr << "tempo = " << tempo << " quarters per minute" << std::endl; | 796 cerr << "tempo = " << tempo << " quarters per minute" << endl; |
797 std::cerr << "seconds since then = " << seconds << std::endl; | 797 cerr << "seconds since then = " << seconds << endl; |
798 SVDEBUG << "resulting time = " << (tempoRealTime + RealTime::fromSeconds(seconds)) << endl; | 798 SVDEBUG << "resulting time = " << (tempoRealTime + RealTime::fromSeconds(seconds)) << endl; |
799 */ | 799 */ |
800 | 800 |
801 return tempoRealTime + RealTime::fromSeconds(seconds); | 801 return tempoRealTime + RealTime::fromSeconds(seconds); |
802 } | 802 } |
930 NoteModel *model = 0; | 930 NoteModel *model = 0; |
931 | 931 |
932 if (existingModel) { | 932 if (existingModel) { |
933 model = dynamic_cast<NoteModel *>(existingModel); | 933 model = dynamic_cast<NoteModel *>(existingModel); |
934 if (!model) { | 934 if (!model) { |
935 std::cerr << "WARNING: MIDIFileReader::loadTrack: Existing model given, but it isn't a NoteModel -- ignoring it" << std::endl; | 935 cerr << "WARNING: MIDIFileReader::loadTrack: Existing model given, but it isn't a NoteModel -- ignoring it" << endl; |
936 } | 936 } |
937 } | 937 } |
938 | 938 |
939 if (!model) { | 939 if (!model) { |
940 model = new NoteModel(m_mainModelSampleRate, 1, 0.0, 0.0, false); | 940 model = new NoteModel(m_mainModelSampleRate, 1, 0.0, 0.0, false); |