comparison data/midi/MIDIEvent.h @ 1733:c3b5564cfb78 by-id

Fix some deprecation warnings
author Chris Cannam
date Mon, 24 Jun 2019 14:28:17 +0100
parents ad5f892c0c4d
children 98339fac0faf
comparison
equal deleted inserted replaced
1732:87b4c596c0ef 1733:c3b5564cfb78
160 m_data2(0), 160 m_data2(0),
161 m_metaEventCode(0), 161 m_metaEventCode(0),
162 m_metaMessage(sysEx) 162 m_metaMessage(sysEx)
163 { } 163 { }
164 164
165 MIDIEvent(const MIDIEvent &) =default;
166 MIDIEvent& operator=(const MIDIEvent &) =default;
167
165 ~MIDIEvent() { } 168 ~MIDIEvent() { }
166 169
167 void setTime(const unsigned long &time) { m_deltaTime = time; } 170 void setTime(const unsigned long &time) { m_deltaTime = time; }
168 void setDuration(const unsigned long& duration) { m_duration = duration;} 171 void setDuration(const unsigned long& duration) { m_duration = duration;}
169 unsigned long addTime(const unsigned long &time) { 172 unsigned long addTime(const unsigned long &time) {
193 void setMetaMessage(const std::string &meta) { m_metaMessage = meta; } 196 void setMetaMessage(const std::string &meta) { m_metaMessage = meta; }
194 197
195 friend bool operator<(const MIDIEvent &a, const MIDIEvent &b); 198 friend bool operator<(const MIDIEvent &a, const MIDIEvent &b);
196 199
197 private: 200 private:
198 MIDIEvent& operator=(const MIDIEvent);
199
200 unsigned long m_deltaTime; 201 unsigned long m_deltaTime;
201 unsigned long m_duration; 202 unsigned long m_duration;
202 MIDIByte m_eventCode; 203 MIDIByte m_eventCode;
203 MIDIByte m_data1; // or Note 204 MIDIByte m_data1; // or Note
204 MIDIByte m_data2; // or Velocity 205 MIDIByte m_data2; // or Velocity