projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'waveview_caching_for_upstream' of https://github.com/nmains/ardour...
[ardour.git]
/
gtk2_ardour
/
editor_selection.cc
diff --git
a/gtk2_ardour/editor_selection.cc
b/gtk2_ardour/editor_selection.cc
index 065cfdbcba42fb323049b0b5cf4dd8f0e8a692d6..e1027e4e9bd0418018e59340b16d2277d6aab233 100644
(file)
--- 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;
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) {
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 */
if (result.second) {
/* newly added to already_in_selection */
- int d = artv->route()->order_key (
EditorSort
);
+ int d = artv->route()->order_key ();
d -= 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 */
/* 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);
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) {
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) {
if (k >= okey && k <= key) {
@@
-1489,6
+1489,8
@@
Editor::select_all_within (framepos_t start, framepos_t end, double top, double
}
if (found.empty()) {
}
if (found.empty()) {
+ selection->clear_objects();
+ selection->clear_time ();
return;
}
return;
}