diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-03 15:14:48 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-03 15:15:39 -0400 |
| commit | ee0f073e8d85b3c376da7c865196c14df9e10c18 (patch) | |
| tree | 511f0a4a32d4f98026f4a35c81954667b778af31 /libs | |
| parent | e8379b3818b8a297d4ed911d1e7a42bc2b55a587 (diff) | |
move from PresentationInfo::global_order() to PresentationInfo::order
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 12 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc_controllable.cc | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index a9ae8007ed..ae83cc20db 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -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()); } } } diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index e6e6852995..4438c6dba4 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -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)) { diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc index dae6ee6d6d..4e6aa3b078 100644 --- a/libs/surfaces/osc/osc_controllable.cc +++ b/libs/surfaces/osc/osc_controllable.cc @@ -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 */ |