ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[USBMIDI] Fix compile error 

* Member variables in USBMIDIMessage and USBMIDI class wrongly
initialized in class declaration
* Add member initialization in constructor
pull/1051/head
Toyomasa Watarai 2015-04-20 14:34:47 +09:00
parent e753aa2d9e
commit 5b74eed7da
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/USBDevice/USBMIDI/MIDIMessage.h
View File

@ -44,9 +44,9 @@
/** A MIDI message container */
class MIDIMessage {
public:
MIDIMessage() {}
MIDIMessage() : length(4) {}
MIDIMessage(uint8_t *buf) {
MIDIMessage(uint8_t *buf) : length(4) {
for (int i = 0; i < 4; i++)
data[i] = buf[i];
}
@ -270,7 +270,7 @@ public:
}
uint8_t data[MAX_MIDI_MESSAGE_SIZE+1];
uint8_t length=4;
uint8_t length;
};
#endif

4
libraries/USBDevice/USBMIDI/USBMIDI.cpp
View File

@ -20,7 +20,9 @@
#include "USBMIDI.h"
USBMIDI::USBMIDI(uint16_t vendor_id, uint16_t product_id, uint16_t product_release): USBDevice(vendor_id, product_id, product_release) {
USBMIDI::USBMIDI(uint16_t vendor_id, uint16_t product_id, uint16_t product_release)
: USBDevice(vendor_id, product_id, product_release), cur_data(0), data_end(true)
{
midi_evt = NULL;
USBDevice::connect();
}

4
libraries/USBDevice/USBMIDI/USBMIDI.h
View File

@ -103,8 +103,8 @@ protected:
private:
uint8_t data[MAX_MIDI_MESSAGE_SIZE+1];
uint8_t cur_data=0;
bool data_end = true;
uint8_t cur_data;
bool data_end;
void (*midi_evt)(MIDIMessage);
};