Fix for route refactor. Fix warning.
git-svn-id: svn://localhost/ardour2/branches/3.0@5163 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
c99ae648f0
commit
1553e41937
@ -660,8 +660,7 @@ void MackieControlProtocol::create_ports()
|
|||||||
|
|
||||||
shared_ptr<Route> MackieControlProtocol::master_route()
|
shared_ptr<Route> MackieControlProtocol::master_route()
|
||||||
{
|
{
|
||||||
boost::shared_ptr<IO> mo = session->master_out ();
|
return session->master_out ();
|
||||||
return boost::dynamic_pointer_cast<Route>(mo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Strip & MackieControlProtocol::master_strip()
|
Strip & MackieControlProtocol::master_strip()
|
||||||
@ -1072,7 +1071,7 @@ void MackieControlProtocol::notify_panner_changed( RouteSignal * route_signal, b
|
|||||||
{
|
{
|
||||||
Pot & pot = route_signal->strip().vpot();
|
Pot & pot = route_signal->strip().vpot();
|
||||||
boost::shared_ptr<Panner> panner = route_signal->route()->panner();
|
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;
|
float pos;
|
||||||
route_signal->route()->panner()->streampanner(0).get_effective_position( pos );
|
route_signal->route()->panner()->streampanner(0).get_effective_position( pos );
|
||||||
|
Loading…
Reference in New Issue
Block a user