diff options
| author | David Robillard <d@drobilla.net> | 2009-02-16 00:53:26 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-16 00:53:26 +0000 |
| commit | fd1a3cfa4cd302a0ce0dbe97810dadb69f323ce6 (patch) | |
| tree | adee113bb75bd025dfa9a4d0acc2bf1927084578 /libs/ardour/ardour | |
| parent | 85ab34179583db06899105586e7ac2d264b437fb (diff) | |
Gracefully ignore illegal MIDI events at the buffer level (i.e. from Jack).
Ardour should now be able to more or less tolerate crazy incoming MIDI (except for SYSEX).
git-svn-id: svn://localhost/ardour2/branches/3.0@4592 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/midi_source.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_track.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 9e01881186..3f8ed82310 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -99,7 +99,8 @@ class MidiSource : public Source protected: virtual void flush_midi() = 0; - virtual nframes_t read_unlocked (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const = 0; + virtual nframes_t read_unlocked (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t cnt, + nframes_t stamp_offset, nframes_t negative_stamp_offset) const = 0; virtual nframes_t write_unlocked (MidiRingBuffer<nframes_t>& dst, nframes_t cnt) = 0; mutable Glib::Mutex _lock; diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index d4054066f1..04f3d055c3 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -95,7 +95,6 @@ protected: int _set_state (const XMLNode&, bool call_base); private: - void write_controller_messages(MidiBuffer& buf, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset); |