From 18e2c366484ec00e6bf8361cb42e9ffc31b71c4c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 29 Mar 2021 11:23:45 -0600 Subject: [PATCH] libevoral: fix arguments to Sequencer::iterator::invalidate() clang picked up the mismatch (gcc did not), which reflects a realization while working on the nutempo2 branch that nothing ever used the old set that was being passed as an argument --- libs/ardour/ardour/midi_cursor.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/ardour/ardour/midi_cursor.h b/libs/ardour/ardour/midi_cursor.h index 5cd60d7aec..580e6e798d 100644 --- a/libs/ardour/ardour/midi_cursor.h +++ b/libs/ardour/ardour/midi_cursor.h @@ -42,8 +42,9 @@ struct MidiCursor : public boost::noncopyable { invalidated.connect_same_thread (connections, boost::bind(&MidiCursor::invalidate, this, _1)); } + void invalidate(bool preserve_notes) { - iter.invalidate (preserve_notes ? &active_notes : NULL); + iter.invalidate (preserve_notes); /* maintain time domain while resetting to zero */ last_read_end = Temporal::timepos_t (last_read_end.time_domain()); } @@ -51,7 +52,7 @@ struct MidiCursor : public boost::noncopyable { Evoral::Sequence::const_iterator iter; std::set::WeakNotePtr> active_notes; timepos_t last_read_end; - PBD::ScopedConnectionList connections; + PBD::ScopedConnectionList connections; }; }