ardour/livetrax
13
0
Fork 0
Code

OSC do not recalc select if still valid

Browse Source
This commit is contained in:
Len Ovens 2018-04-07 10:42:11 -07:00
parent 3a6d7ba321
commit 293326cd94
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/surfaces/osc/osc.cc
View File

@ -4437,17 +4437,23 @@ OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr)
return -1;
}
OSCSurface *sur = get_surface(addr, true);
boost::shared_ptr<Stripable> old_sel = sur->select;
boost::weak_ptr<Stripable> o_sel = sur->select;
boost::shared_ptr<Stripable> old_sel= o_sel.lock ();
if (!s) {
// expand doesn't point to a stripable, turn it off and use select
sur->expand = 0;
sur->expand_enable = false;
if (ControlProtocol::first_selected_stripable()) {
s = ControlProtocol::first_selected_stripable();
// we got a null strip check that old strip is valid
if (old_sel && sur->expand_enable) {
s = old_sel;
} else {
s = session->master_out ();
}
sur->expand = 0;
sur->expand_enable = false;
if (ControlProtocol::first_selected_stripable()) {
s = ControlProtocol::first_selected_stripable();
} else {
s = session->master_out ();
}
_select = s;
}
}
if (s != old_sel) {
sur->select = s;