OSC: simplify route observer

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index dfe87bbccaefaf15b1ade8b3e5dba9c5d675bf93..bc96db636f1151423e4e05f50b2bced1ee4de9cb 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -717,7 +717,7 @@ OSC::listen_to_route (boost::shared_ptr<Stripable> strip, lo_address addr)
 
        OSCSurface *s = get_surface(addr);
        uint32_t ssid = get_sid (strip, addr);
-       OSCRouteObserver* o = new OSCRouteObserver (strip, addr, ssid, s);
+       OSCRouteObserver* o = new OSCRouteObserver (strip, ssid, s);
        route_observers.push_back (o);
 
        strip->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::route_lost, this, boost::weak_ptr<Stripable> (strip)), this);

diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc
index f35c7c3903e6e17f1d7eb725e16b59de97ce89d6..bf1ec249535bb0e508e4c4e6e711b35cf42f50ce 100644 (file)
--- a/libs/surfaces/osc/osc_route_observer.cc
+++ b/libs/surfaces/osc/osc_route_observer.cc
@@ -38,13 +38,13 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace ArdourSurface;
 
-OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, lo_address a, uint32_t ss, ArdourSurface::OSC::OSCSurface* su)
+OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, uint32_t ss, ArdourSurface::OSC::OSCSurface* su)
        : _strip (s)
        ,ssid (ss)
        ,sur (su)
        ,_last_gain (0.0)
 {
-       addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
+       addr = lo_address_new_from_url  (sur->remote_url.c_str());
        gainmode = sur->gainmode;
        feedback = sur->feedback;
        as = ARDOUR::Off;

diff --git a/libs/surfaces/osc/osc_route_observer.h b/libs/surfaces/osc/osc_route_observer.h
index 770d3118a484349a31bfee530fc13ba265c39ce6..a8e682811235616d1990a2c2a9f60ebe024a16af 100644 (file)
--- a/libs/surfaces/osc/osc_route_observer.h
+++ b/libs/surfaces/osc/osc_route_observer.h
@@ -36,7 +36,7 @@ class OSCRouteObserver
 {
 
   public:
-       OSCRouteObserver (boost::shared_ptr<ARDOUR::Stripable>, lo_address addr, uint32_t sid, ArdourSurface::OSC::OSCSurface* sur);
+       OSCRouteObserver (boost::shared_ptr<ARDOUR::Stripable>, uint32_t sid, ArdourSurface::OSC::OSCSurface* sur);
        ~OSCRouteObserver ();
 
        boost::shared_ptr<ARDOUR::Stripable> strip () const { return _strip; }