diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2015-12-20 18:58:52 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2015-12-20 18:58:52 +0100 |
commit | 2d4ac9a7ca89ef1b671e5d4ec57084563a9cc45c (patch) | |
tree | 03929130dc5b685dd8f9ebf49892720c3923139a /src/controllers/midi/portmidicontroller.h | |
parent | 03852d92ae82a8ae8e6e6fbc2d895601ae71ec78 (diff) | |
parent | b59ddd31f05c259577e02eb732182d129e9b0442 (diff) |
Merge remote-tracking branch 'upstream/1.12' into controllerpoll
Conflicts:
src/controllers/midi/portmidicontroller.cpp
src/controllers/midi/portmidicontroller.h
Diffstat (limited to 'src/controllers/midi/portmidicontroller.h')
-rw-r--r-- | src/controllers/midi/portmidicontroller.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/controllers/midi/portmidicontroller.h b/src/controllers/midi/portmidicontroller.h index 37fd02b2e4..c3fa462678 100644 --- a/src/controllers/midi/portmidicontroller.h +++ b/src/controllers/midi/portmidicontroller.h @@ -29,6 +29,9 @@ // a 1024 messages buffer will buffer ~327 ms Midi-Stream #define MIXXX_PORTMIDI_BUFFER_LEN 1024 +// Length of SysEx buffer in byte +#define MIXXX_SYSEX_BUFFER_LEN 1024 + // String to display for no MIDI devices present #define MIXXX_PORTMIDI_NO_DEVICE_STRING "None" @@ -66,7 +69,7 @@ class PortMidiController : public MidiController { PmEvent m_midiBuffer[MIXXX_PORTMIDI_BUFFER_LEN]; // Storage for SysEx messages - unsigned char m_cReceiveMsg[1024]; + unsigned char m_cReceiveMsg[MIXXX_SYSEX_BUFFER_LEN]; int m_cReceiveMsg_index; bool m_bInSysex; }; |