smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 22:25:46 +01:00
Code Issues Projects Releases Wiki Activity

libevoral: fix arguments to Sequencer::iterator::invalidate()

Browse source 
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<Notes> that was being passed
as an argument
This commit is contained in:
Paul Davis 2021-03-29 11:23:45 -06:00
parent 3076d22987
commit 18e2c36648
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/ardour/ardour/midi_cursor.h
View file

@ -42,8 +42,9 @@ struct MidiCursor : public boost::noncopyable {
invalidated.connect_same_thread (connections, boost::bind(&MidiCursor::invalidate, this, _1)); invalidated.connect_same_thread (connections, boost::bind(&MidiCursor::invalidate, this, _1));
} }
void invalidate(bool preserve_notes) { void invalidate(bool preserve_notes) {
iter.invalidate (preserve_notes ? &active_notes : NULL); iter.invalidate (preserve_notes);
/* maintain time domain while resetting to zero */ /* maintain time domain while resetting to zero */
last_read_end = Temporal::timepos_t (last_read_end.time_domain()); last_read_end = Temporal::timepos_t (last_read_end.time_domain());
} }
@ -51,7 +52,7 @@ struct MidiCursor : public boost::noncopyable {
Evoral::Sequence<Temporal::Beats>::const_iterator iter; Evoral::Sequence<Temporal::Beats>::const_iterator iter;
std::set<Evoral::Sequence<Temporal::Beats>::WeakNotePtr> active_notes; std::set<Evoral::Sequence<Temporal::Beats>::WeakNotePtr> active_notes;
timepos_t last_read_end; timepos_t last_read_end;
PBD::ScopedConnectionList connections; PBD::ScopedConnectionList connections;
}; };
} }