smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

commit crash caused by event-sensitive ghost note in MidiView

Browse source
This commit is contained in:
Paul Davis 2025-03-04 12:18:29 -07:00
parent 06050bb578
commit b489d466cf
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/midi_view.cc
View file

@ -1288,9 +1288,9 @@ MidiView::view_changed()
} }
bool bool
MidiView::note_editable (std::shared_ptr<const NoteType> note) const MidiView::note_editable (NoteBase const * ev) const
{ {
return (_visible_channel < 0) || (note->channel() == _visible_channel); return (ev != _ghost_note) && (_visible_channel < 0) || (ev->note()->channel() == _visible_channel);
} }
void void
@ -1780,7 +1780,7 @@ MidiView::update_sustained (Note* ev)
} }
color_note (ev, note->channel()); color_note (ev, note->channel());
ev->set_ignore_events (!note_editable (note)); ev->set_ignore_events (!note_editable (ev));
} }
void void
@ -1789,7 +1789,7 @@ MidiView::color_note (NoteBase* ev, int channel)
// Update color in case velocity has changed // Update color in case velocity has changed
uint32_t base_color = ev->base_color(); uint32_t base_color = ev->base_color();
if (!note_editable (ev->note())) { if (!note_editable (ev)) {
base_color = Gtkmm2ext::change_alpha (base_color, 0.15); base_color = Gtkmm2ext::change_alpha (base_color, 0.15);
} }
@ -1932,7 +1932,7 @@ MidiView::update_hit (Hit* ev)
ev->set_outline_color(ev->calculate_outline(base_col, ev->selected())); ev->set_outline_color(ev->calculate_outline(base_col, ev->selected()));
color_note (ev, _visible_channel); color_note (ev, _visible_channel);
ev->set_ignore_events (!note_editable (note)); ev->set_ignore_events (!ev);
} }
/** Add a MIDI note to the view (with length). /** Add a MIDI note to the view (with length).
@ -2624,7 +2624,7 @@ MidiView::update_drag_selection(timepos_t const & start, timepos_t const & end,
for (auto & [ note, gui ] : _events) { for (auto & [ note, gui ] : _events) {
if (gui->x0() < x1 && gui->x1() > x0 && gui->y0() < y1 && gui->y1() > y0) { if (gui->x0() < x1 && gui->x1() > x0 && gui->y0() < y1 && gui->y1() > y0) {
// Rectangles intersect // Rectangles intersect
if (!gui->selected() && note_editable (note)) { if (!gui->selected() && note_editable (gui)) {
add_to_selection (gui); add_to_selection (gui);
} }
} else if (gui->selected() && !extend) { } else if (gui->selected() && !extend) {
@ -5253,7 +5253,7 @@ MidiView::set_visible_channel (int chn, bool clear_selection)
if (gui->item()->visible()) { if (gui->item()->visible()) {
color_note (gui, note->channel()); color_note (gui, note->channel());
gui->set_ignore_events (!note_editable (note)); gui->set_ignore_events (!note_editable (gui));
} }
} }

2
gtk2_ardour/midi_view.h
View file

@ -390,7 +390,7 @@ class MidiView : public virtual sigc::trackable, public LineMerger
virtual void reset_width_dependent_items (double pixel_width); virtual void reset_width_dependent_items (double pixel_width);
void redisplay (bool view_only); void redisplay (bool view_only);
bool note_editable (std::shared_ptr<const NoteType>) const; bool note_editable (NoteBase const *) const;
protected: protected:
friend class EditingContext; friend class EditingContext;