OSC: Don't look for which stripable is selected until we actually need it, It may be wrong at application start.
This commit is contained in:
parent
55722a74fb
commit
3491f22c04
@ -260,23 +260,8 @@ OSC::start ()
|
|||||||
// order changed
|
// order changed
|
||||||
PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
|
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>();
|
_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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1238,6 +1223,25 @@ OSC::get_surface (lo_address addr)
|
|||||||
return &_surface[it];
|
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
|
// No surface create one with default values
|
||||||
OSCSurface s;
|
OSCSurface s;
|
||||||
s.remote_url = r_url;
|
s.remote_url = r_url;
|
||||||
|
Loading…
Reference in New Issue
Block a user