speed up patch change redisplay when using scroomer / adjusting height.

	- zoom is still a bit slow.

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index c8de0162167a33633c9de06658c85240f8864b3e..91615ddd84ac73dd54322ee45620a233ef0d792c 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -1136,6 +1136,18 @@ MidiRegionView::find_canvas_note (Evoral::event_id_t id)
        return 0;
 }
 
+boost::shared_ptr<PatchChange>
+MidiRegionView::find_canvas_patch_change (MidiModel::PatchChangePtr p)
+{
+       for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) {
+               if ((*x)->patch() == p) {
+                       return (*x);
+               }
+       }
+
+       return 0;
+}
+
 void
 MidiRegionView::get_events (Events& e, Evoral::Sequence<Evoral::Beats>::NoteOperator op, uint8_t val, int chan_mask)
 {
@@ -1246,7 +1258,6 @@ MidiRegionView::redisplay_model()
                }
        }
 
-       _patch_changes.clear();
        _sys_exes.clear();
 
        display_sysexes();
@@ -1282,13 +1293,20 @@ void
 MidiRegionView::display_patch_changes_on_channel (uint8_t channel, bool active_channel)
 {
        for (MidiModel::PatchChanges::const_iterator i = _model->patch_changes().begin(); i != _model->patch_changes().end(); ++i) {
+               boost::shared_ptr<PatchChange> p;
 
                if ((*i)->channel() != channel) {
                        continue;
                }
 
-               const string patch_name = instrument_info().get_patch_name ((*i)->bank(), (*i)->program(), channel);
-               add_canvas_patch_change (*i, patch_name, active_channel);
+               if ((p = find_canvas_patch_change (*i)) != 0) {
+                       framecnt_t region_frames = source_beats_to_region_frames ((*i)->time());
+                       const double x = trackview.editor().sample_to_pixel (region_frames);
+                       p->canvas_item()->set_position (ArdourCanvas::Duple (x, 1.0));
+               } else {
+                       const string patch_name = instrument_info().get_patch_name ((*i)->bank(), (*i)->program(), channel);
+                       add_canvas_patch_change (*i, patch_name, active_channel);
+               }
        }
 }
 
@@ -1913,6 +1931,18 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const
        _patch_changes.push_back (patch_change);
 }
 
+void
+MidiRegionView::remove_canvas_patch_change (PatchChange* pc)
+{
+       /* remove the canvas item */
+       for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) {
+               if ((*x)->patch() == pc->patch()) {
+                       _patch_changes.erase (x);
+                       break;
+               }
+       }
+}
+
 MIDI::Name::PatchPrimaryKey
 MidiRegionView::patch_change_to_patch_key (MidiModel::PatchChangePtr p)
 {
@@ -1953,6 +1983,9 @@ MidiRegionView::change_patch_change (PatchChange& pc, const MIDI::Name::PatchPri
 {
        string name = _("alter patch change");
        trackview.editor().begin_reversible_command (name);
+
+       remove_canvas_patch_change (&pc);
+
        MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (name);
 
        if (pc.patch()->program() != new_patch.program()) {
@@ -1967,7 +2000,6 @@ MidiRegionView::change_patch_change (PatchChange& pc, const MIDI::Name::PatchPri
        _model->apply_command (*trackview.session(), c);
        trackview.editor().commit_reversible_command ();
 
-       _patch_changes.clear ();
        display_patch_changes ();
 }
 
@@ -1978,6 +2010,13 @@ MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const
        trackview.editor().begin_reversible_command (name);
        MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (name);
 
+       for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) {
+               if ((*x)->patch() == old_change) {
+                       _patch_changes.erase (x);
+                       break;
+               }
+       }       
+
        if (old_change->time() != new_change.time()) {
                c->change_time (old_change, new_change.time());
        }
@@ -1997,7 +2036,6 @@ MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const
        _model->apply_command (*trackview.session(), c);
        trackview.editor().commit_reversible_command ();
 
-       _patch_changes.clear ();
        display_patch_changes ();
 }
 
@@ -2025,7 +2063,6 @@ MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChange<Evoral::Beat
        _model->apply_command (*trackview.session(), c);
        trackview.editor().commit_reversible_command ();
 
-       _patch_changes.clear ();
        display_patch_changes ();
 }
 
@@ -2038,7 +2075,6 @@ MidiRegionView::move_patch_change (PatchChange& pc, Evoral::Beats t)
        _model->apply_command (*trackview.session(), c);
        trackview.editor().commit_reversible_command ();
 
-       _patch_changes.clear ();
        display_patch_changes ();
 }
 
@@ -2046,12 +2082,14 @@ void
 MidiRegionView::delete_patch_change (PatchChange* pc)
 {
        trackview.editor().begin_reversible_command (_("delete patch change"));
+
+       remove_canvas_patch_change (pc);
+
        MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("delete patch change"));
        c->remove (pc->patch ());
        _model->apply_command (*trackview.session(), c);
        trackview.editor().commit_reversible_command ();
 
-       _patch_changes.clear ();
        display_patch_changes ();
 }
 

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index a99881bc216d63207fc12319e3c61e5bac5fe848..7c60c2a037b49494eafdafb0d4216287b1b154a6 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
@@ -462,6 +463,8 @@ private:
        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);