X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fsurface_port.h;h=bdc089985d1e1b61360854f72bd3d539cf5ebd45;hb=7229dccb3ba3e8feb94fa8b5bf8a1f39d0508ce8;hp=70b1df4580d8153472f789be9d4c863211b4660c;hpb=33140f32671576a285d62f529447f941f96313fc;p=ardour.git

diff --git a/libs/surfaces/mackie/surface_port.h b/libs/surfaces/mackie/surface_port.h
index 70b1df4580..bdc089985d 100644
--- a/libs/surfaces/mackie/surface_port.h
+++ b/libs/surfaces/mackie/surface_port.h
@@ -1,35 +1,44 @@
 /*
-	Copyright (C) 2006,2007 John Anderson
+  Copyright (C) 2006,2007 John Anderson
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #ifndef surface_port_h
 #define surface_port_h
 
 #include <midi++/types.h>
-#include <glibmm/thread.h>
 
 #include "pbd/signals.h"
+
+
 #include "midi_byte_array.h"
 #include "types.h"
 
 namespace MIDI {
-	class Port;
 	class Parser;
+	class Port;
+}
+
+
+namespace ARDOUR {
+	class AsyncMIDIPort;
+	class Port;
 }
 
+namespace ArdourSurface {
+
 class MackieControlProtocol;
 
 namespace Mackie
@@ -38,33 +47,45 @@ namespace Mackie
 class Surface;
 
 /**
-	Make a relationship between a midi port and a Mackie device.
+   Make a relationship between a midi port and a Mackie device.
 */
 
-class SurfacePort 
+class SurfacePort
 {
-public:
+  public:
 	SurfacePort (Mackie::Surface&);
 	virtual ~SurfacePort();
-	
+
 	/// 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; }
 
-protected:
+	MIDI::Port& input_port() const { return *_input_port; }
+	MIDI::Port& output_port() const { return *_output_port; }
+
+	ARDOUR::Port& input() const { return *_async_in; }
+	ARDOUR::Port& output() const { return *_async_out; }
+
+	std::string input_name() const;
+	std::string output_name() const;
 
-private:
-	Mackie::Surface* _surface;
-	MIDI::Port*  _input_port;
-	MIDI::Port*  _output_port;
-};	
+	void reconnect ();
+
+	XMLNode& get_state ();
+	int set_state (const XMLNode&, int version);
+
+  protected:
+
+  private:
+	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);
 
+}
 }
 
 #endif