From 07e869fda8d92fed1a375f85f54f13a75c7d5493 Mon Sep 17 00:00:00 2001 From: Len Ovens Date: Sun, 23 Jul 2017 17:11:59 -0700 Subject: OSC: simplify route observer --- libs/surfaces/osc/osc.cc | 2 +- libs/surfaces/osc/osc_route_observer.cc | 4 ++-- libs/surfaces/osc/osc_route_observer.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index dfe87bbcca..bc96db636f 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -717,7 +717,7 @@ OSC::listen_to_route (boost::shared_ptr 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 (strip)), this); diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc index f35c7c3903..bf1ec24953 100644 --- 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 s, lo_address a, uint32_t ss, ArdourSurface::OSC::OSCSurface* su) +OSCRouteObserver::OSCRouteObserver (boost::shared_ptr 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 770d3118a4..a8e6828112 100644 --- 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, lo_address addr, uint32_t sid, ArdourSurface::OSC::OSCSurface* sur); + OSCRouteObserver (boost::shared_ptr, uint32_t sid, ArdourSurface::OSC::OSCSurface* sur); ~OSCRouteObserver (); boost::shared_ptr strip () const { return _strip; } -- cgit v1.2.3