Mercurial > hg > svcore
comparison data/midi/MIDIInput.cpp @ 1221:a1b97df9962e 3.0-integration
Merge from branch msvc2015_64
| author | Chris Cannam |
|---|---|
| date | Thu, 20 Oct 2016 11:16:22 +0100 |
| parents | 794b64e62e58 |
| children | b0533d195c83 |
comparison
equal
deleted
inserted
replaced
| 1215:f50ded4b951c | 1221:a1b97df9962e |
|---|---|
| 15 | 15 |
| 16 #include "MIDIInput.h" | 16 #include "MIDIInput.h" |
| 17 | 17 |
| 18 #include "rtmidi/RtMidi.h" | 18 #include "rtmidi/RtMidi.h" |
| 19 | 19 |
| 20 #include <unistd.h> | 20 #include "system/System.h" |
| 21 | 21 |
| 22 MIDIInput::MIDIInput(QString name, FrameTimer *timer) : | 22 MIDIInput::MIDIInput(QString name, FrameTimer *timer) : |
| 23 m_rtmidi(), | 23 m_rtmidi(), |
| 24 m_frameTimer(timer), | 24 m_frameTimer(timer), |
| 25 m_buffer(1023) | 25 m_buffer(1023) |