diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-22 15:29:44 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-22 15:29:44 -0400 |
| commit | 664e715a002450ac0f079411f6f051c122a4322a (patch) | |
| tree | 762f2a060843f77504ff39e2257ed4f32e6f83a1 /gtk2_ardour/editor_selection.cc | |
| parent | f86599cd74197ceb3e2e5cfe80a9a2dd5ee4201a (diff) | |
| parent | 61e66bb7631fc070a629d83e91855f58d7fb2489 (diff) | |
merge from master
Diffstat (limited to 'gtk2_ardour/editor_selection.cc')
| -rw-r--r-- | gtk2_ardour/editor_selection.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 065cfdbcba..59425b289c 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -779,7 +779,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op) RouteTimeAxisView* closest = 0; int distance = INT_MAX; - int key = rtv->route()->order_key (EditorSort); + int key = rtv->route()->order_key (); for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) { @@ -794,7 +794,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op) if (result.second) { /* newly added to already_in_selection */ - int d = artv->route()->order_key (EditorSort); + int d = artv->route()->order_key (); d -= key; @@ -810,7 +810,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op) /* now add all tracks between that one and this one */ - int okey = closest->route()->order_key (EditorSort); + int okey = closest->route()->order_key (); if (okey > key) { swap (okey, key); @@ -820,7 +820,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op) RouteTimeAxisView* artv = dynamic_cast<RouteTimeAxisView*>(*x); if (artv && artv != rtv) { - int k = artv->route()->order_key (EditorSort); + int k = artv->route()->order_key (); if (k >= okey && k <= key) { |