comparison data/midi/MIDIInput.cpp @ 1365:3382d914e110

Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:44 +0000
parents 794b64e62e58
children b0533d195c83
comparison
equal deleted inserted replaced
1272:6a7ea3bd0e10 1365:3382d914e110
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)