diff options
author | nick_m <mainsbridge@gmail.com> | 2016-10-15 23:50:02 +1100 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-10-15 23:50:02 +1100 |
commit | 9698f16aee5f91d158551d333fe0fb1b23d22859 (patch) | |
tree | 0a23078aefc5e0df27908594ff8fed2c9d8a85e0 /gtk2_ardour/midi_region_view.cc | |
parent | 7da51b979257bd051d26c35f82f37a2a69839232 (diff) |
Note selection state uses note event_id_t.
Diffstat (limited to 'gtk2_ardour/midi_region_view.cc')
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 1900f71abc..60a6630451 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -1115,12 +1115,12 @@ MidiRegionView::find_canvas_note (boost::shared_ptr<NoteType> note) /** This version finds any canvas note matching the supplied note. */ NoteBase* -MidiRegionView::find_canvas_note (NoteType note) +MidiRegionView::find_canvas_note (Evoral::event_id_t id) { Events::iterator it; for (it = _events.begin(); it != _events.end(); ++it) { - if (*((*it)->note()) == note) { + if ((*it)->note()->id() == id) { return *it; } } @@ -1200,9 +1200,9 @@ MidiRegionView::redisplay_model() cne = add_note (note, visible); } - set<boost::shared_ptr<NoteType> >::iterator it; + set<Evoral::event_id_t>::iterator it; for (it = _pending_note_selection.begin(); it != _pending_note_selection.end(); ++it) { - if (*(*it) == *note) { + if ((*it) == note->id()) { add_to_selection (cne); } } @@ -2229,13 +2229,13 @@ MidiRegionView::invert_selection () The requested notes most likely won't exist in the view until the next model redisplay. */ void -MidiRegionView::select_notes (list<boost::shared_ptr<NoteType> > notes) +MidiRegionView::select_notes (list<Evoral::event_id_t> notes) { NoteBase* cne; - list<boost::shared_ptr<NoteType> >::iterator n; + list<Evoral::event_id_t>::iterator n; for (n = notes.begin(); n != notes.end(); ++n) { - if ((cne = find_canvas_note(*(*n))) != 0) { + if ((cne = find_canvas_note(*n)) != 0) { add_to_selection (cne); } else { _pending_note_selection.insert(*n); |