diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/adlmidi.cpp | 2 | ||||
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 10 | ||||
| -rw-r--r-- | src/adlmidi_private.hpp | 8 | ||||
| -rw-r--r-- | src/adlmidi_sequencer.cpp | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp index e77278c..c3c07a7 100644 --- a/src/adlmidi.cpp +++ b/src/adlmidi.cpp @@ -1342,7 +1342,7 @@ ADLMIDI_EXPORT void adl_rt_bankChange(struct ADL_MIDIPlayer *device, ADL_UInt8 c player->realTime_BankChange(channel, (uint16_t)bank); } -ADLMIDI_EXPORT int adl_rt_systemExclusive(struct ADL_MIDIPlayer *device, const ADL_UInt8 *msg, unsigned size) +ADLMIDI_EXPORT int adl_rt_systemExclusive(struct ADL_MIDIPlayer *device, const ADL_UInt8 *msg, size_t size) { if(!device) return -1; diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index 8b4f27f..ba5b1ef 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -712,7 +712,7 @@ void MIDIplay::setDeviceId(uint8_t id) m_sysExDeviceId = id; } -bool MIDIplay::realTime_SysEx(const uint8_t *msg, unsigned size) +bool MIDIplay::realTime_SysEx(const uint8_t *msg, size_t size) { if(size < 4 || msg[0] != 0xF0 || msg[size - 1] != 0xF7) return false; @@ -739,7 +739,7 @@ bool MIDIplay::realTime_SysEx(const uint8_t *msg, unsigned size) return false; } -bool MIDIplay::doUniversalSysEx(unsigned dev, bool realtime, const uint8_t *data, unsigned size) +bool MIDIplay::doUniversalSysEx(unsigned dev, bool realtime, const uint8_t *data, size_t size) { bool devicematch = dev == 0x7F || dev == m_sysExDeviceId; if(size < 2 || !devicematch) @@ -773,7 +773,7 @@ bool MIDIplay::doUniversalSysEx(unsigned dev, bool realtime, const uint8_t *data return false; } -bool MIDIplay::doRolandSysEx(unsigned dev, const uint8_t *data, unsigned size) +bool MIDIplay::doRolandSysEx(unsigned dev, const uint8_t *data, size_t size) { bool devicematch = dev == 0x7F || (dev & 0x0F) == m_sysExDeviceId; if(size < 6 || !devicematch) @@ -788,7 +788,7 @@ bool MIDIplay::doRolandSysEx(unsigned dev, const uint8_t *data, unsigned size) #if !defined(ADLMIDI_SKIP_ROLAND_CHECKSUM) { unsigned checkvalue = 0; - for(unsigned i = 0; i < size; ++i) + for(size_t i = 0; i < size; ++i) checkvalue += data[i] & 0x7F; checkvalue = (128 - (checkvalue & 127)) & 127; if(checkvalue != checksum) @@ -831,7 +831,7 @@ bool MIDIplay::doRolandSysEx(unsigned dev, const uint8_t *data, unsigned size) return false; } -bool MIDIplay::doYamahaSysEx(unsigned dev, const uint8_t *data, unsigned size) +bool MIDIplay::doYamahaSysEx(unsigned dev, const uint8_t *data, size_t size) { bool devicematch = dev == 0x7F || (dev & 0x0F) == m_sysExDeviceId; if(size < 1 || !devicematch) diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 67f1ccb..280232f 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -914,7 +914,7 @@ public: * @param size Length of SysEx message * @return true if message was passed successfully. False on any errors */ - bool realTime_SysEx(const uint8_t *msg, unsigned size); + bool realTime_SysEx(const uint8_t *msg, size_t size); /** * @brief Turn off all notes and mute the sound of releasing notes @@ -967,9 +967,9 @@ private: YamahaModel_XG = 0x4C }; - bool doUniversalSysEx(unsigned dev, bool realtime, const uint8_t *data, unsigned size); - bool doRolandSysEx(unsigned dev, const uint8_t *data, unsigned size); - bool doYamahaSysEx(unsigned dev, const uint8_t *data, unsigned size); + bool doUniversalSysEx(unsigned dev, bool realtime, const uint8_t *data, size_t size); + bool doRolandSysEx(unsigned dev, const uint8_t *data, size_t size); + bool doYamahaSysEx(unsigned dev, const uint8_t *data, size_t size); private: enum diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp index ac983d0..b8bf3dd 100644 --- a/src/adlmidi_sequencer.cpp +++ b/src/adlmidi_sequencer.cpp @@ -79,7 +79,7 @@ static void rtPitchBend(void *userdata, uint8_t channel, uint8_t msb, uint8_t ls static void rtSysEx(void *userdata, const uint8_t *msg, size_t size) { MIDIplay *context = reinterpret_cast<MIDIplay *>(userdata); - context->realTime_SysEx(msg, (unsigned)size); + context->realTime_SysEx(msg, size); } |