one step closer to working vbap panning

[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 b01b5e0cf5f99ce59cae0a9464573291b5a641b6..2f6a6f7c5f8ff633a1be05ab193e14c1528f3b59 100644 (file)
--- a/libs/surfaces/mackie/route_signal.cc
+++ b/libs/surfaces/mackie/route_signal.cc
@@ -17,66 +17,71 @@
 */
 #include "route_signal.h"
 
-#include <ardour/route.h>
-#include <ardour/track.h>
-#include <ardour/panner.h>
-#include <ardour/types.h>
+#include "ardour/route.h"
+#include "ardour/track.h"
+#include "ardour/midi_ui.h"
+#include "ardour/panner.h"
+#include "ardour/session_object.h" // for Properties::name 
 
 #include "mackie_control_protocol.h"
 
 #include <stdexcept>
 
+using namespace ARDOUR;
 using namespace Mackie;
+using namespace std;
+
+#define midi_ui_context() MidiControlUI::instance() /* a UICallback-derived object that specifies the event loop for signal handling */
+#define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__))
 
 void RouteSignal::connect()
 {
-       if ( _strip.has_solo() )
-               _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 ), this ) );
+       if (_strip.has_solo()) {
+               _route->solo_control()->Changed.connect(connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_solo_changed, &_mcp, this), midi_ui_context());
+       }
+
+       if (_strip.has_mute()) {
+               _route->mute_control()->Changed.connect(connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_mute_changed, &_mcp, this), midi_ui_context());
+       }
+
+       if (_strip.has_gain()) {
+               _route->gain_control()->Changed.connect(connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_gain_changed, &_mcp, this, false), midi_ui_context());
+       }
+
+       _route->PropertyChanged.connect (connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_property_changed, &_mcp, _1, this), midi_ui_context());
        
-       if ( _strip.has_gain() )
-               _gain_changed_connection = _route.control(ARDOUR::GainAutomation)->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_gain_changed ), this ) );
+       if (_route->panner()) {
+               _route->panner()->Changed.connect(connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_panner_changed, &_mcp, this, false), midi_ui_context());
                
-       _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 ), this ) );
+               for ( unsigned int i = 0; i < _route->panner()->npanners(); ++i ) {
+                       _route->panner()->streampanner(i).Changed.connect (connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_panner_changed, &_mcp, this, false), midi_ui_context());
+               }
        }
        
-       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 ), this ) )
-               ;
+       boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<ARDOUR::Track>(_route);
+       if (trk) {
+               trk->rec_enable_control()->Changed .connect(connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_record_enable_changed, &_mcp, this), midi_ui_context());
        }
-       catch ( std::bad_cast & )
-       {
-               // this should catch the dynamic_cast to Track, if what we're working
-               // with can't be record-enabled
-       }
-
+       
+       // TODO this works when a currently-banked route is made inactive, but not
+       // when a route is activated which should be currently banked.
+       _route->active_changed.connect (connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_active_changed, &_mcp, this), midi_ui_context());
+       
        // TODO
-       // active_changed
        // SelectedChanged
        // RemoteControlIDChanged. Better handled at Session level.
 }
 
 void RouteSignal::disconnect()
 {
-       _solo_changed_connection.disconnect();
-       _mute_changed_connection.disconnect();
-       _gain_changed_connection.disconnect();
-       _name_changed_connection.disconnect();
-       _panner_changed_connection.disconnect();
-       _record_enable_changed_connection.disconnect();
+       connections.drop_connections ();
 }
 
 void RouteSignal::notify_all()
 {
+#ifdef DEBUG
+       cout << "RouteSignal::notify_all for " << _strip << endl;
+#endif
        if ( _strip.has_solo() )
                _mcp.notify_solo_changed( this );
        
@@ -86,11 +91,14 @@ void RouteSignal::notify_all()
        if ( _strip.has_gain() )
                _mcp.notify_gain_changed( this );
        
-       _mcp.notify_name_changed( this );
+       _mcp.notify_property_changed (PBD::PropertyChange (ARDOUR::Properties::name), this );
        
        if ( _strip.has_vpot() )
                _mcp.notify_panner_changed( this );
        
        if ( _strip.has_recenable() )
                _mcp.notify_record_enable_changed( this );
+#ifdef DEBUG
+       cout << "RouteSignal::notify_all finish" << endl;
+#endif
 }