Preformance - reinstate EditorRegions::freeze_tree_model ().

This commit is contained in:
nick_m 2016-04-09 03:21:13 +10:00
parent ec29f5d64c
commit 618a391346
4 changed files with 36 additions and 0 deletions

View file

@ -1586,6 +1586,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void queue_visual_videotimeline_update (); void queue_visual_videotimeline_update ();
void embed_audio_from_video (std::string, framepos_t n = 0, bool lock_position_to_video = true); 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: private:
friend class DragManager; friend class DragManager;
friend class EditorRouteGroups; friend class EditorRouteGroups;

View file

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

View file

@ -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::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()); 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 bool
@ -1406,6 +1408,25 @@ EditorRegions::get_single_selection ()
return (*iter)[_columns.region]; 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 void
EditorRegions::locked_changed (std::string const & path) EditorRegions::locked_changed (std::string const & path)
{ {

View file

@ -377,6 +377,8 @@ RhythmFerret::do_split_action ()
return; return;
} }
editor.EditorFreeze(); /* Emit signal */
editor.begin_reversible_command (_("split regions (rhythm ferret)")); editor.begin_reversible_command (_("split regions (rhythm ferret)"));
/* Merge the transient positions for regions in consideration */ /* Merge the transient positions for regions in consideration */
@ -407,6 +409,8 @@ RhythmFerret::do_split_action ()
} }
editor.commit_reversible_command (); editor.commit_reversible_command ();
editor.EditorThaw(); /* Emit signal */
} }
void void