diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-04 14:32:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-04 14:32:28 +0000 |
| commit | 89d1a2fdf5f9794f56f6bf960bfbebfad913cf74 (patch) | |
| tree | 5a2d55a420955f86151ba37870f1de0762195456 /gtk2_ardour/editor_routes.cc | |
| parent | 1feaa65d167e59b400b8ac003f69e33934ee7c08 (diff) | |
dramatically speed up the addition of large numbers of busses + tracks. consists of a backend part (ignore JACK graph/latency callbacks while we're adding tracks) and a GUI side (avoid O(N^N) behaviour while adding each new time axis view)
git-svn-id: svn://localhost/ardour2/branches/3.0@13595 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_routes.cc')
| -rw-r--r-- | gtk2_ardour/editor_routes.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index acbbb697f2..e1a8bc6450 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -69,6 +69,7 @@ EditorRoutes::EditorRoutes (Editor* e) : EditorComponent (e) , _ignore_reorder (false) , _no_redisplay (false) + , _adding_routes (false) , _menu (0) , old_focus (0) , selection_countdown (0) @@ -600,9 +601,12 @@ void EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) { TreeModel::Row row; + PBD::Unwinder<bool> at (_adding_routes, true); suspend_redisplay (); + _display.set_model (Glib::RefPtr<ListStore>()); + for (list<RouteTimeAxisView*>::iterator x = routes.begin(); x != routes.end(); ++x) { boost::shared_ptr<MidiTrack> midi_trk = boost::dynamic_pointer_cast<MidiTrack> ((*x)->route()); @@ -653,6 +657,7 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) (*x)->route()->solo_isolated_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_isolate_display, this), gui_context()); (*x)->route()->solo_safe_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_safe_display, this), gui_context()); (*x)->route()->active_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_active_display, this), gui_context ()); + } update_rec_display (); @@ -662,7 +667,9 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) update_solo_safe_display (); update_input_active_display (); update_active_display (); + resume_redisplay (); + _display.set_model (_model); /* now update route order keys from the treeview/track display order */ @@ -672,7 +679,9 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) void EditorRoutes::handle_gui_changes (string const & what, void*) { - ENSURE_GUI_THREAD (*this, &EditorRoutes::handle_gui_changes, what, src) + if (_adding_routes) { + return; + } if (what == "track_height") { /* Optional :make tracks change height while it happens, instead |