Mercurial > hg > svcore
comparison data/fileio/MIDIFileReader.h @ 1599:ce185d4dd408 bqaudiostream
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 23 Jan 2019 14:43:43 +0000 |
parents | c01cbe41aeb5 |
children |
comparison
equal
deleted
inserted
replaced
1598:d2555df635ec | 1599:ce185d4dd408 |
---|---|
64 MIDIFileImportPreferenceAcquirer *pref, // may be null | 64 MIDIFileImportPreferenceAcquirer *pref, // may be null |
65 sv_samplerate_t mainModelSampleRate, | 65 sv_samplerate_t mainModelSampleRate, |
66 ProgressReporter *reporter = 0); | 66 ProgressReporter *reporter = 0); |
67 virtual ~MIDIFileReader(); | 67 virtual ~MIDIFileReader(); |
68 | 68 |
69 virtual bool isOK() const; | 69 bool isOK() const override; |
70 virtual QString getError() const; | 70 QString getError() const override; |
71 virtual Model *load() const; | 71 Model *load() const override; |
72 | 72 |
73 protected: | 73 protected: |
74 typedef std::vector<MIDIEvent *> MIDITrack; | 74 typedef std::vector<MIDIEvent *> MIDITrack; |
75 typedef std::map<unsigned int, MIDITrack> MIDIComposition; | 75 typedef std::map<unsigned int, MIDITrack> MIDIComposition; |
76 typedef std::pair<RealTime, double> TempoChange; // time, qpm | 76 typedef std::pair<RealTime, double> TempoChange; // time, qpm |