X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fsurface_port.h;h=bdc089985d1e1b61360854f72bd3d539cf5ebd45;hb=e6e2b6800e081c1a416638c4312b81415e190320;hp=c060e52d935fee59570b90cd65a5891c37c592ad;hpb=a38e2aff788a61c15405100c3be444cf2f5767d2;p=ardour.git

diff --git a/libs/surfaces/mackie/surface_port.h b/libs/surfaces/mackie/surface_port.h
index c060e52d93..bdc089985d 100644
--- a/libs/surfaces/mackie/surface_port.h
+++ b/libs/surfaces/mackie/surface_port.h
@@ -1,98 +1,91 @@
 /*
-	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 <sigc++/signal.h>
-#include <glibmm/thread.h>
+#include <midi++/types.h>
+
+#include "pbd/signals.h"
+
 
 #include "midi_byte_array.h"
 #include "types.h"
 
 namespace MIDI {
+	class Parser;
+	class Port;
+}
+
+
+namespace ARDOUR {
+	class AsyncMIDIPort;
 	class Port;
 }
 
+namespace ArdourSurface {
+
+class MackieControlProtocol;
+
 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 : public sigc::trackable
+
+class SurfacePort
 {
-public:
-	SurfacePort( MIDI::Port & port, int number );
-	virtual ~SurfacePort() {}
-	
-	// when this is successful, active() should return true
-	virtual void open() = 0;
-	virtual void close() = 0;
-
-	/// read bytes from the port. They'll either end up in the
-	/// parser, or if that's not active they'll be returned
-	MidiByteArray read();
-	
+  public:
+	SurfacePort (Mackie::Surface&);
+	virtual ~SurfacePort();
+
 	/// an easier way to output bytes via midi
-	void write( const MidiByteArray & );
-	
-	/// write a sysex message
-	void write_sysex( const MidiByteArray & mba );
-	void write_sysex( MIDI::byte msg );
-
-	// return the correct sysex header for this port
-	virtual const MidiByteArray & sysex_hdr() const = 0;
-
-	MIDI::Port & port() { return _port; }
-	const MIDI::Port & port() const { return _port; }
-	
-	// all control notofications are sent from here
-	sigc::signal<void, SurfacePort &, Control &, const ControlState &> control_event;
-	
-	// emitted just before the port goes into initialisation
-	// where it tries to establish that its device is connected
-	sigc::signal<void> init_event;
-	
-	// emitted when the port completes initialisation successfully
-	sigc::signal<void> active_event;
-
-	// emitted when the port goes inactive (ie a read or write failed)
-	sigc::signal<void> inactive_event;
-	
-	// the port number - master is 0, extenders are 1,2,3,4
-	virtual int number() const { return _number; }
-	
-	// number of strips handled by this port. Usually 8.
-	virtual int strips() const = 0;
-
-	virtual bool active() const { return _active; }
-	virtual void active( bool yn ) { _active = yn; }
-	
-private:
-	MIDI::Port & _port;
-	int _number;
-	bool _active;
-
-	Glib::RecMutex _rwlock;
-};	
-
-std::ostream & operator << ( std::ostream & , const SurfacePort & port );
+	int write (const MidiByteArray&);
+
+	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;
+
+	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