diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-06 12:52:48 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-06 12:58:48 -0400 |
commit | a0f0bdc063e81fd6f98fbcb1268538106cca753a (patch) | |
tree | 09f95a08247d17e37cf3c19e54fde12919d7ea7d /gtk2_ardour/editor.cc | |
parent | 6a622d86dca2c8af8993d85be8bd8a44debc5b8c (diff) |
try to keep editor+mixer treemodels in sync
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r-- | gtk2_ardour/editor.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 972583d57d..8bca7211fe 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -126,6 +126,7 @@ #include "region_layering_order_editor.h" #include "rgb_macros.h" #include "rhythm_ferret.h" +#include "route_sorter.h" #include "selection.h" #include "simple_progress_dialog.h" #include "sfdb_ui.h" @@ -5219,21 +5220,6 @@ Editor::add_routes (RouteList& rlist) add_stripables (sl); } -struct PresentationInfoEditorSorter -{ - bool operator() (boost::shared_ptr<Stripable> a, boost::shared_ptr<Stripable> b) { - if (a->is_master()) { - /* master before everything else */ - return true; - } else if (b->is_master()) { - /* everything else before master */ - return false; - } - return a->presentation_info().order () < b->presentation_info().order (); - } -}; - - void Editor::add_stripables (StripableList& sl) { @@ -5243,7 +5229,7 @@ Editor::add_stripables (StripableList& sl) TrackViewList new_selection; bool from_scratch = (track_views.size() == 0); - sl.sort (PresentationInfoEditorSorter()); + sl.sort (StripablePresentationInfoSorter()); for (StripableList::iterator s = sl.begin(); s != sl.end(); ++s) { |