Preformance - reinstate EditorRegions::freeze_tree_model ().

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 653b1857b0d349e4da34b62acdd89ba1890cb174..96b3d490fb02739c9ac98249efb111d942f58ed5 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1586,6 +1586,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void queue_visual_videotimeline_update ();
        void embed_audio_from_video (std::string, framepos_t n = 0, bool lock_position_to_video = true);
 
+       PBD::Signal0<void> EditorFreeze;
+       PBD::Signal0<void> EditorThaw;
+
   private:
        friend class DragManager;
        friend class EditorRouteGroups;

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index b8e308c57e281dd5db197ba43804d724defed112..960b7b3123fda7dfa71346de68bf1cc84ff1e679 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -153,6 +153,8 @@ Editor::redo (uint32_t n)
 void
 Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 {
+       bool frozen = false;
+
        RegionSelection pre_selected_regions = selection->regions;
        bool working_on_selection = !pre_selected_regions.empty();
 
@@ -180,6 +182,8 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
        } else {
                snap_to (where);
 
+               frozen = true;
+               EditorFreeze(); /* Emit Signal */
        }
 
        for (RegionSelection::iterator a = regions.begin(); a != regions.end(); ) {
@@ -247,6 +251,10 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
                (*c).disconnect ();
        }
 
+       if (frozen){
+               EditorThaw(); /* Emit Signal */
+       }
+
        if (working_on_selection) {
                // IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw.
 

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index c6620958c6b31786cff44489a976a3a645b88804..f95e5b797e2cf25c48e7fe6ff1efffd60ca7192e 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -255,6 +255,8 @@ EditorRegions::EditorRegions (Editor* e)
        ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::region_changed, this, _1, _2), gui_context());
        ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::add_region, this, _1), gui_context());
 
+       e->EditorFreeze.connect (editor_freeze_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::freeze_tree_model, this), gui_context());
+       e->EditorThaw.connect (editor_thaw_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::thaw_tree_model, this), gui_context());
 }
 
 bool
@@ -1406,6 +1408,25 @@ EditorRegions::get_single_selection ()
        return (*iter)[_columns.region];
 }
 
+void
+EditorRegions::freeze_tree_model (){
+
+       _display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+       _model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance
+
+}
+
+void
+EditorRegions::thaw_tree_model (){
+
+       _model->set_sort_column (0, SORT_ASCENDING); // renabale sorting
+       _display.set_model (_model);
+
+       if (toggle_full_action()->get_active()) {
+               _display.expand_all();
+       }
+}
+
 void
 EditorRegions::locked_changed (std::string const & path)
 {

diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index 964418843de6b37b04a50fedfe42ec92962d0c07..d73b376439f61720eff0f030c521d6f80b1ba27f 100644 (file)
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -377,6 +377,8 @@ RhythmFerret::do_split_action ()
                return;
        }
 
+       editor.EditorFreeze(); /* Emit signal */
+
        editor.begin_reversible_command (_("split regions (rhythm ferret)"));
 
        /* Merge the transient positions for regions in consideration */
@@ -407,6 +409,8 @@ RhythmFerret::do_split_action ()
        }
 
        editor.commit_reversible_command ();
+
+       editor.EditorThaw(); /* Emit signal */
 }
 
 void