Mercurial > hg > svcore
comparison data/fileio/MIDIFileReader.h @ 935:f960d67ce842 tonioni
Merge from branch warnfix_no_size_t
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 13:42:01 +0100 |
parents | 59e7fe1b1003 |
children | cc27f35aa75c |
comparison
equal
deleted
inserted
replaced
925:3efc20c59a94 | 935:f960d67ce842 |
---|---|
60 Q_OBJECT | 60 Q_OBJECT |
61 | 61 |
62 public: | 62 public: |
63 MIDIFileReader(QString path, | 63 MIDIFileReader(QString path, |
64 MIDIFileImportPreferenceAcquirer *pref, | 64 MIDIFileImportPreferenceAcquirer *pref, |
65 size_t mainModelSampleRate); | 65 int mainModelSampleRate); |
66 virtual ~MIDIFileReader(); | 66 virtual ~MIDIFileReader(); |
67 | 67 |
68 virtual bool isOK() const; | 68 virtual bool isOK() const; |
69 virtual QString getError() const; | 69 virtual QString getError() const; |
70 virtual Model *load() const; | 70 virtual Model *load() const; |
124 MIDIComposition m_midiComposition; | 124 MIDIComposition m_midiComposition; |
125 TempoMap m_tempoMap; | 125 TempoMap m_tempoMap; |
126 | 126 |
127 QString m_path; | 127 QString m_path; |
128 std::ifstream *m_midiFile; | 128 std::ifstream *m_midiFile; |
129 size_t m_fileSize; | 129 int m_fileSize; |
130 QString m_error; | 130 QString m_error; |
131 size_t m_mainModelSampleRate; | 131 int m_mainModelSampleRate; |
132 | 132 |
133 MIDIFileImportPreferenceAcquirer *m_acquirer; | 133 MIDIFileImportPreferenceAcquirer *m_acquirer; |
134 }; | 134 }; |
135 | 135 |
136 | 136 |