incomplete merge of master into windows (requires upcoming changes to master to be complete)

1 files changed, 15 insertions, 8 deletions

diff --git a/libs/surfaces/mackie/surface_port.h b/libs/surfaces/mackie/surface_port.h
index 7dc20a06f2..751ee848d7 100644
--- a/libs/surfaces/mackie/surface_port.h
+++ b/libs/surfaces/mackie/surface_port.h
@@ -21,16 +21,23 @@
 #include <midi++/types.h>
 
 #include "pbd/signals.h"
+
+
 #include "midi_byte_array.h"
 #include "types.h"
 
 namespace MIDI {
-	class Port;
 	class Parser;
+	class Port;
 }
 
 class MackieControlProtocol;
 
+namespace ARDOUR {
+	class AsyncMIDIPort;
+	class Port;
+}
+
 namespace Mackie
 {
 
@@ -49,17 +56,17 @@ public:
 	/// an easier way to output bytes via midi
 	int write (const MidiByteArray&);
 	
-	MIDI::Port& input_port() { return *_input_port; }
-	const MIDI::Port& input_port() const { return *_input_port; }
-	MIDI::Port& output_port() { return *_output_port; }
-	const MIDI::Port& output_port() const { return *_output_port; }
+    MIDI::Port& input_port() const { return *_input_port; }
+    MIDI::Port& output_port() const { return *_output_port; }
 
 protected:
 
 private:
-	Mackie::Surface* _surface;
-	MIDI::Port*  _input_port;
-	MIDI::Port*  _output_port;
+    Mackie::Surface*   _surface;
+    MIDI::Port* _input_port;
+    MIDI::Port* _output_port;
+    boost::shared_ptr<ARDOUR::Port> _async_in;
+    boost::shared_ptr<ARDOUR::Port> _async_out;
 };	
 
 std::ostream& operator <<  (std::ostream& , const SurfacePort& port);