diff options
author | Carl Hetherington <carl@carlh.net> | 2009-06-11 11:50:56 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-06-11 11:50:56 +0000 |
commit | 1553e419375ae031496b42fc18c838230a28cdf4 (patch) | |
tree | ee0ec71e4a8a74576ae8106afed38a9f283cd7ba /libs/surfaces | |
parent | c99ae648f05073f3b1d607cb15b826d2525a38a7 (diff) |
Fix for route refactor. Fix warning.
git-svn-id: svn://localhost/ardour2/branches/3.0@5163 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 6902b3406d..29a28ffcd5 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -660,8 +660,7 @@ void MackieControlProtocol::create_ports() shared_ptr<Route> MackieControlProtocol::master_route() { - boost::shared_ptr<IO> mo = session->master_out (); - return boost::dynamic_pointer_cast<Route>(mo); + return session->master_out (); } Strip & MackieControlProtocol::master_strip() @@ -1072,7 +1071,7 @@ void MackieControlProtocol::notify_panner_changed( RouteSignal * route_signal, b { Pot & pot = route_signal->strip().vpot(); boost::shared_ptr<Panner> panner = route_signal->route()->panner(); - if ( panner && panner->npanners() == 1 || ( panner->npanners() == 2 && panner->linked() ) ) + if ( (panner && panner->npanners() == 1) || ( panner->npanners() == 2 && panner->linked() ) ) { float pos; route_signal->route()->panner()->streampanner(0).get_effective_position( pos ); |