ardour/livetrax
13
0
Fork 0
Code

move from PresentationInfo::global_order() to PresentationInfo::order

Browse Source
This commit is contained in:
Paul Davis 2016-06-03 15:14:48 -04:00
parent e8379b3818
commit ee0f073e8d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -2115,15 +2115,15 @@ MackieControlProtocol::select_range ()
for (StripableList::iterator s = stripables.begin(); s != stripables.end(); ++s) {
if (main_modifier_state() == MODIFIER_SHIFT) {
/* XXX can only use numeric part of ID at present */
ToggleStripableSelection ((*s)->presentation_info ().global_order());
/* XXX can only use order part of PresentationInfo at present */
ToggleStripableSelection ((*s)->presentation_info ().order());
} else {
if (s == stripables.begin()) {
/* XXX can only use numeric part of ID at present */
SetStripableSelection ((*s)->presentation_info().global_order());
/* XXX can only use order part of PresentationInfo at present */
SetStripableSelection ((*s)->presentation_info().order());
} else {
/* XXX can only use numeric part of ID at present */
AddStripableToSelection ((*s)->presentation_info().global_order());
/* XXX can only use order part of PresentationInfo at present */
AddStripableToSelection ((*s)->presentation_info().order());
}
}
}

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

@ -588,7 +588,7 @@ OSC::listen_to_route (boost::shared_ptr<Stripable> strip, lo_address addr)
}
OSCSurface *s = get_surface(addr);
uint32_t sid = get_sid (strip->presentation_info().group_order(), addr);
uint32_t sid = get_sid (strip->presentation_info().order(), addr);
// above is zero based add 1
OSCRouteObserver* o = new OSCRouteObserver (strip, addr, sid + 1, s->gainmode, s->feedback);
route_observers.push_back (o);
@ -1012,8 +1012,8 @@ OSC::routes_list (lo_message msg)
lo_message_add_int32 (reply, r->n_outputs().n_audio());
lo_message_add_int32 (reply, r->muted());
lo_message_add_int32 (reply, r->soloed());
/* XXX Can only use group ID at this point */
lo_message_add_int32 (reply, r->presentation_info().group_order());
/* XXX Can only use order at this point */
lo_message_add_int32 (reply, r->presentation_info().order());
if (boost::dynamic_pointer_cast<AudioTrack>(r)
|| boost::dynamic_pointer_cast<MidiTrack>(r)) {

2
libs/surfaces/osc/osc_controllable.cc
View File

@ -92,7 +92,7 @@ OSCRouteControllable::send_change_message ()
/* Can only send ID part of RID at present */
lo_message_add_int32 (msg, _route->presentation_info().group_order());
lo_message_add_int32 (msg, _route->presentation_info().order());
lo_message_add_float (msg, (float) controllable->get_value());
/* XXX thread issues */