summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Ovens <len@ovenwerks.net>2017-07-23 17:11:59 -0700
committerLen Ovens <len@ovenwerks.net>2017-07-23 20:08:02 -0700
commit07e869fda8d92fed1a375f85f54f13a75c7d5493 (patch)
tree4571a966f4f921894b29ef9126029f7e88a8af11
parentb29b46d371b0721c49071481796ab2c7bcfc915f (diff)
OSC: simplify route observer
-rw-r--r--libs/surfaces/osc/osc.cc2
-rw-r--r--libs/surfaces/osc/osc_route_observer.cc4
-rw-r--r--libs/surfaces/osc/osc_route_observer.h2
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<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 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<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 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<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; }