ardour/livetrax
13
0
Fork 0
Code

OSC: Don't look for which stripable is selected until we actually need it, It may be wrong at application start.

Browse Source
This commit is contained in:
Len Ovens 2016-07-01 18:12:31 -07:00
parent 55722a74fb
commit 3491f22c04
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,23 +260,8 @@ OSC::start ()
// order changed
PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
// guess at which stripable is the current editor mixerstrip
// right now just choose the first one we find, may be the wrong one
// hopefully we will have access to session->current_strip at some point
StripableList stripables;
session->get_stripables (stripables);
_select = boost::shared_ptr<Stripable>();
for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
boost::shared_ptr<Stripable> s = *it;
if (s->is_selected()) {
_select = s;
break;
}
}
return 0;
}
@ -1238,6 +1223,25 @@ OSC::get_surface (lo_address addr)
return &_surface[it];
}
}
// if we do this when OSC is started we get the wrong stripable
// we don't need this until we actually have a surface to deal with
if (!_select) {
// guess at which stripable is the current editor mixerstrip
// right now just choose the first one we find, may be the wrong one
// hopefully we will have access to session->current_strip at some point
StripableList stripables;
session->get_stripables (stripables);
for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
boost::shared_ptr<Stripable> s = *it;
if (s->is_selected()) {
_select = s;
break;
}
}
}
// No surface create one with default values
OSCSurface s;
s.remote_url = r_url;