note display performance.

[ardour.git] / gtk2_ardour / midi_region_view.h

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index db769b44fcde38c17ac3fa0be316c10ff0be3328..e1af49abceb7421d67048fa29da1a792ef7433fc 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -126,6 +126,7 @@ public:
        void paste_internal (framepos_t pos, unsigned paste_count, float times, const MidiCutBuffer&);
 
        void add_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr patch, const std::string& displaytext, bool);
+       void remove_canvas_patch_change (PatchChange* pc);
 
        /** Look up the given time and channel in the 'automation' and set keys accordingly.
         * @param time the time of the patch change event
@@ -202,7 +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<boost::shared_ptr<NoteType> >);
+       void select_notes (std::list<Evoral::event_id_t>);
        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);
 
@@ -355,6 +356,9 @@ private:
 
        friend class MidiRubberbandSelectDrag;
        friend class MidiVerticalSelectDrag;
+       friend class NoteDrag;
+       friend class NoteCreateDrag;
+       friend class HitCreateDrag;
 
        friend class EditNoteDialog;
 
@@ -377,7 +381,7 @@ private:
        bool note_canvas_event(GdkEvent* ev);
 
        void midi_channel_mode_changed ();
-        PBD::ScopedConnection _channel_mode_changed_connection;
+       PBD::ScopedConnection _channel_mode_changed_connection;
        void instrument_settings_changed ();
        PBD::ScopedConnection _instrument_changed_connection;
 
@@ -405,9 +409,9 @@ private:
        uint8_t  _current_range_min;
        uint8_t  _current_range_max;
 
-       typedef std::list<NoteBase*>                          Events;
-       typedef std::vector< boost::shared_ptr<PatchChange> > PatchChanges;
-       typedef std::vector< boost::shared_ptr<SysEx> >       SysExes;
+       typedef boost::unordered_map<boost::shared_ptr<NoteType>, NoteBase*>                 Events;
+       typedef boost::unordered_map<ARDOUR::MidiModel::PatchChangePtr, boost::shared_ptr<PatchChange> > PatchChanges;
+       typedef std::vector< boost::shared_ptr<SysEx> >                                      SysExes;
 
        ARDOUR::BeatsFramesConverter _region_relative_time_converter;
        ARDOUR::BeatsFramesConverter _source_relative_time_converter;
@@ -434,9 +438,6 @@ private:
        /** Currently selected NoteBase objects */
        Selection _selection;
 
-       bool _sort_needed;
-       void time_sort_events ();
-
        MidiCutBuffer* selection_as_cut_buffer () const;
 
        /** New notes (created in the current command) which should be selected
@@ -444,7 +445,7 @@ private:
        std::set< boost::shared_ptr<NoteType> > _marked_for_selection;
 
        /** Notes that should be selected when the model is redisplayed. */
-       std::set< boost::shared_ptr<NoteType> > _pending_note_selection;
+       std::set<Evoral::event_id_t> _pending_note_selection;
 
        /** New notes (created in the current command) which should have visible velocity
         * when they appear after the command is applied. */
@@ -456,9 +457,11 @@ private:
        PBD::ScopedConnection content_connection;
 
        NoteBase* find_canvas_note (boost::shared_ptr<NoteType>);
-       NoteBase* find_canvas_note (NoteType);
+       NoteBase* find_canvas_note (Evoral::event_id_t id);
        Events::iterator _optimization_iterator;
 
+       boost::shared_ptr<PatchChange> find_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr p);
+
        void update_note (NoteBase*, bool update_ghost_regions = true);
        void update_sustained (Note *, bool update_ghost_regions = true);
        void update_hit (Hit *, bool update_ghost_regions = true);
@@ -501,22 +504,32 @@ private:
 
        framecnt_t _last_display_zoom;
 
-       double _last_event_x;
-       double _last_event_y;
-       bool   _grabbed_keyboard;
-       bool   _entered;
-       bool   _note_entered;
+       double    _last_event_x;
+       double    _last_event_y;
+       bool      _grabbed_keyboard;
+       bool      _entered;
+       NoteBase* _entered_note;
 
        bool _mouse_changed_selection;
 
+       ArdourCanvas::Color _patch_change_outline;
+       ArdourCanvas::Color _patch_change_fill;
+
        Evoral::Beats snap_frame_to_grid_underneath (framepos_t p, int32_t divisions, bool shift_snap) const;
 
        PBD::ScopedConnection _mouse_mode_connection;
 
        boost::shared_ptr<CursorContext> _press_cursor_ctx;
 
-        ARDOUR::ChannelMode get_channel_mode() const;
-        uint16_t get_selected_channels () const;
+       ARDOUR::ChannelMode get_channel_mode() const;
+       uint16_t get_selected_channels () const;
+
+       inline double contents_height() const { return (_height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
+       inline double contents_note_range () const { return (double)(_current_range_max - _current_range_min + 1); }
+       inline double note_height() const { return contents_height() / contents_note_range(); }
+
+       double note_to_y (uint8_t note) const;
+       uint8_t y_to_note (double y) const;
 };