diff options
| author | David Robillard <d@drobilla.net> | 2014-11-20 15:32:06 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-11-20 15:32:06 -0500 |
| commit | 8bba63282a4d641287d6da945fc7ce49b583038c (patch) | |
| tree | 486b62c6c73363dbe67f66126c55aa1214264eaa /libs | |
| parent | 7def8de5a3ce6ca6e022075bf3b9faf24fc2a129 (diff) | |
Reduce unnecessary non-const MIDI buffer access.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/midi_state_tracker.h | 2 | ||||
| -rw-r--r-- | libs/ardour/meter.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/midi_state_tracker.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/plugin.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h index a77ffdada3..1a3d480045 100644 --- a/libs/ardour/ardour/midi_state_tracker.h +++ b/libs/ardour/ardour/midi_state_tracker.h @@ -38,7 +38,7 @@ class LIBARDOUR_API MidiStateTracker public: MidiStateTracker(); - void track (const MidiBuffer::iterator& from, const MidiBuffer::iterator& to); + void track (const MidiBuffer::const_iterator& from, const MidiBuffer::const_iterator& to); void add (uint8_t note, uint8_t chn); void remove (uint8_t note, uint8_t chn); void resolve_notes (MidiBuffer& buffer, framepos_t time); diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 80690bd744..5913ca5477 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -87,9 +87,9 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr // Meter MIDI in to the first n_midi peaks for (uint32_t i = 0; i < n_midi; ++i, ++n) { float val = 0.0f; - MidiBuffer& buf (bufs.get_midi(i)); + const MidiBuffer& buf (bufs.get_midi(i)); - for (MidiBuffer::iterator e = buf.begin(); e != buf.end(); ++e) { + for (MidiBuffer::const_iterator e = buf.begin(); e != buf.end(); ++e) { const Evoral::MIDIEvent<framepos_t> ev(*e, false); if (ev.is_note_on()) { const float this_vel = ev.buffer()[2] / 127.0; diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc index 5e99c35294..f006004621 100644 --- a/libs/ardour/midi_state_tracker.cc +++ b/libs/ardour/midi_state_tracker.cc @@ -84,9 +84,9 @@ MidiStateTracker::remove (uint8_t note, uint8_t chn) } void -MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::iterator &to) +MidiStateTracker::track (const MidiBuffer::const_iterator &from, const MidiBuffer::const_iterator &to) { - for (MidiBuffer::iterator i = from; i != to; ++i) { + for (MidiBuffer::const_iterator i = from; i != to; ++i) { track(*i); } } diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index 11d859ed8c..14766fca2a 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -264,7 +264,7 @@ Plugin::connect_and_run (BufferSet& bufs, /* Track notes that we are sending to the plugin */ - MidiBuffer& b = bufs.get_midi (0); + const MidiBuffer& b = bufs.get_midi (0); _tracker.track (b.begin(), b.end()); |