one step closer to working vbap panning

[ardour.git] / libs / surfaces / mackie / mackie_control_protocol.h

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 14be7b437080dce071b2beb84f7aab4979453882..3007df8f5a5d60a37dce0a4cee3a8f5426829b34 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -85,6 +85,8 @@ class MackieControlProtocol
        
        Mackie::Surface & surface();
 
+       std::list<boost::shared_ptr<ARDOUR::Bundle> > bundles ();
+
        // control events
        void handle_control_event(Mackie::SurfacePort & port, Mackie::Control & control, const Mackie::ControlState & state);
 
@@ -99,7 +101,7 @@ class MackieControlProtocol
        /// Signal handler for Route::gain_changed (from IO)
        void notify_gain_changed(Mackie::RouteSignal *, bool force_update = true);
        /// Signal handler for Route::name_change
-       void notify_name_changed(Mackie::RouteSignal *);
+       void notify_property_changed(const PBD::PropertyChange&, Mackie::RouteSignal *);
        /// Signal handler from Panner::Change
        void notify_panner_changed(Mackie::RouteSignal *, bool force_update = true);
        /// Signal handler for new routes added
@@ -266,7 +268,7 @@ class MackieControlProtocol
        */
        bool handle_strip_button(Mackie::Control &, Mackie::ButtonState, boost::shared_ptr<ARDOUR::Route>);
 
-       void add_port(MIDI::Port &, int number);
+       void add_port (MIDI::Port &, MIDI::Port &, int number);
 
        /**
           Read session data and send to surface. Includes
@@ -337,6 +339,11 @@ class MackieControlProtocol
        
        // Which timecode are we displaying? BBT or Timecode
        ARDOUR::AnyTime::Type _timecode_type;
+
+       // Bundle to represent our input ports
+       boost::shared_ptr<ARDOUR::Bundle> _input_bundle;
+       // Bundle to represent our output ports
+       boost::shared_ptr<ARDOUR::Bundle> _output_bundle;
 };
 
 #endif // ardour_mackie_control_protocol_h