From 44203ce955f33135065456f55f1f685131174ba6 Mon Sep 17 00:00:00 2001 From: nick_m Date: Sun, 11 Jan 2015 04:07:31 +1100 Subject: Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues. --- gtk2_ardour/midi_region_view.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gtk2_ardour/midi_region_view.h') diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 4f64e4410f..6ffdf98c25 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -203,6 +203,7 @@ public: void move_selection(double dx, double dy, double cumulative_dy); void note_dropped (NoteBase* ev, ARDOUR::frameoffset_t, int8_t d_note); + void select_notes (std::list >); void select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend); void toggle_matching_notes (uint8_t notenum, uint16_t channel_mask); @@ -438,6 +439,9 @@ private: * when they appear after the command is applied. */ std::set< boost::shared_ptr > _marked_for_selection; + /** Notes that should be selected when the model is redisplayed. */ + std::set< boost::shared_ptr > _pending_note_selection; + /** New notes (created in the current command) which should have visible velocity * when they appear after the command is applied. */ std::set< boost::shared_ptr > _marked_for_velocity; @@ -448,6 +452,7 @@ private: PBD::ScopedConnection content_connection; NoteBase* find_canvas_note (boost::shared_ptr); + NoteBase* find_canvas_note (NoteType); Events::iterator _optimization_iterator; void update_note (NoteBase*, bool update_ghost_regions = true); @@ -499,6 +504,8 @@ private: bool _grabbed_keyboard; bool _entered; + bool _mouse_changed_selection; + framepos_t snap_frame_to_grid_underneath (framepos_t p, framecnt_t &) const; PBD::ScopedConnection _mouse_mode_connection; -- cgit v1.2.3