From 8ca72c4eca3a712f5368680ba0fbce5beb831324 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 12 May 2008 02:40:48 +0000 Subject: Fix various MIDI corruption bugs. Re-enable MIDI CC controller bars and other immediate output (hans commented out, tsk tsk). Write channel mode as textual enumeration instead of magic number. Better atomic (almost) channel mode switching on MIDI ring buffer (was a possible, if unlikely, source of corruption). Handle some cases of broken MIDI, and oversized events, more gracefully. git-svn-id: svn://localhost/ardour2/branches/3.0@3335 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/midi_buffer.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libs/ardour/midi_buffer.cc') diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index 042f9529ad..4628de4a6a 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -195,7 +195,10 @@ MidiBuffer::push_back(const jack_midi_event_t& ev) Byte* MidiBuffer::reserve(double time, size_t size) { - assert(size <= MAX_EVENT_SIZE); + if (size > MAX_EVENT_SIZE) { + cerr << "WARNING: Failed to reserve " << size << " bytes for event"; + return 0; + } if (_size == _capacity) return 0; -- cgit v1.2.3