chris goddard's region list patch; port 2.X marker drag/move changes to 3.0; compilat...

[ardour.git] / libs / surfaces / mackie / route_signal.cc

diff --git a/libs/surfaces/mackie/route_signal.cc b/libs/surfaces/mackie/route_signal.cc
index 8c62548714d153c377c2a93163014c2794d5a506..adaeadd805661974fb6b66f4ceb508eb6fd30a3e 100644 (file)
--- a/libs/surfaces/mackie/route_signal.cc
+++ b/libs/surfaces/mackie/route_signal.cc
@@ -20,6 +20,7 @@
 #include <ardour/route.h>
 #include <ardour/track.h>
 #include <ardour/panner.h>
+#include <ardour/types.h>
 
 #include "mackie_control_protocol.h"
 
@@ -30,26 +31,26 @@ using namespace Mackie;
 void RouteSignal::connect()
 {
        if ( _strip.has_solo() )
-               _solo_changed_connection = _route.solo_control().Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_solo_changed ), &_route, &_port ) );
+               _solo_changed_connection = _route.solo_control()->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_solo_changed ), this ) );
        
        if ( _strip.has_mute() )
-               _mute_changed_connection = _route.mute_control().Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_mute_changed ), &_route, &_port ) );
+               _mute_changed_connection = _route.mute_control()->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_mute_changed ), this ) );
        
        if ( _strip.has_gain() )
-               _gain_changed_connection = _route.gain_control().Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_gain_changed ), &_route, &_port ) );
+               _gain_changed_connection = _route.gain_control()->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_gain_changed ), this ) );
                
-       _name_changed_connection = _route.name_changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_name_changed ), &_route, &_port ) );
+       _name_changed_connection = _route.NameChanged.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_name_changed ), this ) );
        
        if ( _route.panner().size() == 1 )
        {
-               _panner_changed_connection = _route.panner()[0]->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_panner_changed ), &_route, &_port ) );
+               _panner_changed_connection = _route.panner()[0]->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_panner_changed ), this ) );
        }
        
        try
        {
                _record_enable_changed_connection =
-                       dynamic_cast<ARDOUR::Track&>( _route ).rec_enable_control().Changed
-                               .connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_record_enable_changed ), &_route, &_port ) )
+                       dynamic_cast<ARDOUR::Track&>( _route ).rec_enable_control()->Changed
+                               .connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_record_enable_changed ), this ) )
                ;
        }
        catch ( std::bad_cast & )
@@ -77,19 +78,19 @@ void RouteSignal::disconnect()
 void RouteSignal::notify_all()
 {
        if ( _strip.has_solo() )
-               _mcp.notify_solo_changed( &_route, &_port );
+               _mcp.notify_solo_changed( this );
        
        if ( _strip.has_mute() )
-               _mcp.notify_mute_changed( &_route, &_port );
+               _mcp.notify_mute_changed( this );
        
        if ( _strip.has_gain() )
-               _mcp.notify_gain_changed( &_route, &_port );
+               _mcp.notify_gain_changed( this );
        
-       _mcp.notify_name_changed( &_route, &_route, &_port );
+       _mcp.notify_name_changed( this );
        
        if ( _strip.has_vpot() )
-               _mcp.notify_panner_changed( &_route, &_port );
+               _mcp.notify_panner_changed( this );
        
        if ( _strip.has_recenable() )
-               _mcp.notify_record_enable_changed( &_route, &_port );
+               _mcp.notify_record_enable_changed( this );
 }