Reduce unnecessary non-const MIDI buffer access.

diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h
index a77ffdada33c28a910d799337bfe51be3055d257..1a3d480045d5d148c1879afb6f161ebb46ba7fc3 100644 (file)
--- 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 80690bd74479e2d77c68c9ff574d77d7ab8f27f7..5913ca54773aa1b70b47454f5a6d64e9bd153ca1 100644 (file)
--- 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 5e99c35294bab4745b8a8add5204cece6f4e7718..f006004621073a5e102dfe480569003711c09360 100644 (file)
--- 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 11d859ed8c81fe3558d5effcd200dfb5781b0e1f..14766fca2a7102140f200f9911d81644378e7324 100644 (file)
--- 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());