summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-03-29 16:48:56 +1100
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:13 +1000
commita53d94c3d0cf7cb331c6a48afcebdb5d2706141d (patch)
tree93cdd45ab789a812685e85416479faed1270da62
parent7cb5fca27b8a8fe41c3f1e4f8a14a2f5343762da (diff)
Perfornamce - remove dubious optimisation.
-rw-r--r--gtk2_ardour/editor.h3
-rw-r--r--gtk2_ardour/editor_ops.cc8
-rw-r--r--gtk2_ardour/editor_regions.cc21
-rw-r--r--gtk2_ardour/rhythm_ferret.cc4
4 files changed, 0 insertions, 36 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 96b3d490fb..653b1857b0 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1586,9 +1586,6 @@ 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 960b7b3123..b8e308c57e 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -153,8 +153,6 @@ 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();
@@ -182,8 +180,6 @@ 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(); ) {
@@ -251,10 +247,6 @@ 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 f95e5b797e..c6620958c6 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -255,8 +255,6 @@ 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
@@ -1409,25 +1407,6 @@ EditorRegions::get_single_selection ()
}
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)
{
TreeIter i = _model->get_iter (path);
diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index d73b376439..964418843d 100644
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -377,8 +377,6 @@ 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 */
@@ -409,8 +407,6 @@ RhythmFerret::do_split_action ()
}
editor.commit_reversible_command ();
-
- editor.EditorThaw(); /* Emit signal */
}
void