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

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index a9ae8007ed3eadfc796c983efd2ba097f0524801..ae83cc20dbc8fe80bce88b601a3b153b01450add 100644 (file)
--- 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 e6e6852995488b7cbab3ab278efbb085378df42d..4438c6dba4775b0edeef1d49aeda91e69e92e8b4 100644 (file)
--- 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 dae6ee6d6d2d894db1524d58b47061a6536fa5b8..4e6aa3b078c97f9ea65906d42206d327383973de 100644 (file)
--- 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 */