summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorSakari Bergen <sakari.bergen@beatwaves.net>2010-11-29 22:39:21 +0000
committerSakari Bergen <sakari.bergen@beatwaves.net>2010-11-29 22:39:21 +0000
commitea8f9cb58e47729195faa066c591c7e8fdb43f11 (patch)
tree17794dea2a7690775049fb7d45e42cdb4482bfd1 /libs
parent9f634f1f569462e8d1e00d05e95765d516ba82fd (diff)
Removing more of using boost::shared_ptr
git-svn-id: svn://localhost/ardour2/branches/3.0@8128 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/surfaces/mackie/mackie_control_protocol.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 05cbc45f65..44e6b28d78 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -67,8 +67,6 @@ using namespace std;
using namespace Mackie;
using namespace PBD;
-using boost::shared_ptr;
-
#include "i18n.h"
MackieMidiBuilder builder;
@@ -187,7 +185,7 @@ MackieControlProtocol::port_for_id (uint32_t index)
// predicate for sort call in get_sorted_routes
struct RouteByRemoteId
{
- bool operator () (const shared_ptr<Route> & a, const shared_ptr<Route> & b) const
+ bool operator () (const boost::shared_ptr<Route> & a, const boost::shared_ptr<Route> & b) const
{
return a->remote_control_id() < b->remote_control_id();
}
@@ -526,7 +524,7 @@ MackieControlProtocol::update_surface()
boost::shared_ptr<Route> mr = master_route ();
if (mr) {
- master_route_signal = shared_ptr<RouteSignal> (new RouteSignal (mr, *this, master_strip(), mcu_port()));
+ master_route_signal = boost::shared_ptr<RouteSignal> (new RouteSignal (mr, *this, master_strip(), mcu_port()));
// update strip from route
master_route_signal->notify_all();
}
@@ -628,7 +626,7 @@ MackieControlProtocol::create_ports()
}
}
-shared_ptr<Route>
+boost::shared_ptr<Route>
MackieControlProtocol::master_route()
{
return session->master_out ();