Fix for route refactor. Fix warning.
authorCarl Hetherington <carl@carlh.net>
Thu, 11 Jun 2009 11:50:56 +0000 (11:50 +0000)
committerCarl Hetherington <carl@carlh.net>
Thu, 11 Jun 2009 11:50:56 +0000 (11:50 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@5163 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/surfaces/mackie/mackie_control_protocol.cc

index 6902b3406d11d3e0d8bf8c73c69fd533d46258b5..29a28ffcd5ae8f8aeacc533319c74209845e5fd7 100644 (file)
@@ -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 );