OSC: no op, white space cleanup

[ardour.git] / libs / surfaces / osc / osc_controllable.cc

diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc
index 9b87ddbb640810bbfe611216e253b3254f4339ad..23bc4a79fbe5bbd8147ef180c8af79b4e8ddfea1 100644 (file)
--- a/libs/surfaces/osc/osc_controllable.cc
+++ b/libs/surfaces/osc/osc_controllable.cc
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2009 Paul Davis
- 
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -27,7 +27,6 @@
 #include "osc.h"
 #include "osc_controllable.h"
 
-using namespace sigc;
 using namespace PBD;
 using namespace ARDOUR;
 using namespace ArdourSurface;
@@ -63,7 +62,7 @@ void
 OSCControllable::send_change_message ()
 {
        lo_message msg = lo_message_new ();
-       
+
        lo_message_add_float (msg, (float) controllable->get_value());
 
        /* XXX thread issues */
@@ -72,9 +71,9 @@ OSCControllable::send_change_message ()
        lo_message_free (msg);
 }
 
-/*------------------------------------------------------------*/       
+/*------------------------------------------------------------*/
 
-OSCRouteControllable::OSCRouteControllable (lo_address a, const std::string& p, 
+OSCRouteControllable::OSCRouteControllable (lo_address a, const std::string& p,
                                            boost::shared_ptr<Controllable> c, boost::shared_ptr<Route> r)
        : OSCControllable (a, p, c)
        , _route (r)
@@ -90,7 +89,9 @@ OSCRouteControllable::send_change_message ()
 {
        lo_message msg = lo_message_new ();
 
-       lo_message_add_int32 (msg, _route->remote_control_id());
+       /* Can only send ID part of RID at present */
+
+       lo_message_add_int32 (msg, _route->presentation_info().order());
        lo_message_add_float (msg, (float) controllable->get_value());
 
        /* XXX thread issues */