From ab8116e725fa815d72c78d8872a2829edde8693b Mon Sep 17 00:00:00 2001 From: Sakari Bergen Date: Fri, 28 Jan 2011 22:58:47 +0000 Subject: [PATCH] Add boost:: to shared_ptrs (not to be ambiguous with std::shared_ptr, Deja vu :) git-svn-id: svn://localhost/ardour2/branches/3.0@8604 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/surfaces/osc/osc_route_observer.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc index 1433cd146b..91a47fde76 100644 --- a/libs/surfaces/osc/osc_route_observer.cc +++ b/libs/surfaces/osc/osc_route_observer.cc @@ -35,7 +35,7 @@ using namespace ARDOUR; using namespace boost; -OSCRouteObserver::OSCRouteObserver (shared_ptr r, lo_address a) +OSCRouteObserver::OSCRouteObserver (boost::shared_ptr r, lo_address a) : _route (r) { addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a)); @@ -44,19 +44,19 @@ OSCRouteObserver::OSCRouteObserver (shared_ptr r, lo_address a) if (dynamic_pointer_cast(_route) || dynamic_pointer_cast(_route)) { - shared_ptr track = dynamic_pointer_cast(r); - shared_ptr rec_controllable = dynamic_pointer_cast(track->rec_enable_control()); + boost::shared_ptr track = dynamic_pointer_cast(r); + boost::shared_ptr rec_controllable = dynamic_pointer_cast(track->rec_enable_control()); rec_controllable->Changed.connect (rec_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/rec"), track->rec_enable_control()), OSC::instance()); } - shared_ptr mute_controllable = dynamic_pointer_cast(_route->mute_control()); + boost::shared_ptr mute_controllable = dynamic_pointer_cast(_route->mute_control()); mute_controllable->Changed.connect (mute_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/mute"), _route->mute_control()), OSC::instance()); - shared_ptr solo_controllable = dynamic_pointer_cast(_route->solo_control()); + boost::shared_ptr solo_controllable = dynamic_pointer_cast(_route->solo_control()); solo_controllable->Changed.connect (solo_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/solo"), _route->solo_control()), OSC::instance()); - shared_ptr gain_controllable = dynamic_pointer_cast(_route->gain_control()); + boost::shared_ptr gain_controllable = dynamic_pointer_cast(_route->gain_control()); gain_controllable->Changed.connect (gain_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/gain"), _route->gain_control()), OSC::instance()); } @@ -92,7 +92,7 @@ OSCRouteObserver::name_changed (const PBD::PropertyChange& what_changed) } void -OSCRouteObserver::send_change_message (string path, shared_ptr controllable) +OSCRouteObserver::send_change_message (string path, boost::shared_ptr controllable) { lo_message msg = lo_message_new ();