Mercurial > hg > svcore
diff data/fileio/MIDIFileReader.cpp @ 929:59e7fe1b1003 warnfix_no_size_t
Unsigned removals and warning fixes in data/
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 14:33:42 +0100 |
parents | e802e550a1f2 |
children | 12e62865fd61 |
line wrap: on
line diff
--- a/data/fileio/MIDIFileReader.cpp Tue Jun 17 13:52:07 2014 +0100 +++ b/data/fileio/MIDIFileReader.cpp Tue Jun 17 14:33:42 2014 +0100 @@ -57,7 +57,7 @@ MIDIFileReader::MIDIFileReader(QString path, MIDIFileImportPreferenceAcquirer *acquirer, - size_t mainModelSampleRate) : + int mainModelSampleRate) : m_smpte(false), m_timingDivision(0), m_fps(0), @@ -896,7 +896,7 @@ if (tracksToLoad.empty()) return 0; - size_t n = tracksToLoad.size(), count = 0; + int n = tracksToLoad.size(), count = 0; Model *model = 0; for (std::set<unsigned int>::iterator i = tracksToLoad.begin(); @@ -943,10 +943,9 @@ const MIDITrack &track = m_midiComposition.find(trackToLoad)->second; - size_t totalEvents = track.size(); - size_t count = 0; + int totalEvents = track.size(); + int count = 0; - bool minorKey = false; bool sharpKey = true; for (MIDITrack::const_iterator i = track.begin(); i != track.end(); ++i) { @@ -968,7 +967,7 @@ switch((*i)->getMetaEventCode()) { case MIDI_KEY_SIGNATURE: - minorKey = (int((*i)->getMetaMessage()[1]) != 0); + // minorKey = (int((*i)->getMetaMessage()[1]) != 0); sharpKey = (int((*i)->getMetaMessage()[0]) >= 0); break;