merge (w/fix) with master

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

diff --git a/libs/surfaces/mackie/surface_port.h b/libs/surfaces/mackie/surface_port.h
index 214c8e6291fa003a80a29b32fed1ea520b238927..b361294fa91c6f14a9fcc4a204dc3d0955a3d679 100644 (file)
--- a/libs/surfaces/mackie/surface_port.h
+++ b/libs/surfaces/mackie/surface_port.h
@@ -18,89 +18,61 @@
 #ifndef surface_port_h
 #define surface_port_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;
+}
+
+class MackieControlProtocol;
+
+namespace ARDOUR {
+       class AsyncMIDIPort;
        class Port;
 }
 
 namespace Mackie
 {
 
+class Surface;
+
 /**
        Make a relationship between a midi port and a Mackie device.
 */
-class SurfacePort
+
+class SurfacePort 
 {
 public:
-       SurfacePort (MIDI::Port & input_port, MIDI::Port & output_port, int number);
-       virtual ~SurfacePort();
-       
-       // when this is successful, active() should return true
-       virtual void open() = 0;
-       
-       // subclasses should call this before doing their own close
-       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
-       virtual MidiByteArray read();
-       
-       /// an easier way to output bytes via midi
-       virtual void write( const MidiByteArray & );
+    SurfacePort (Mackie::Surface&);
+    virtual ~SurfacePort();
+    
+    /// an easier way to output bytes via midi
+    int write (const MidiByteArray&);
        
-       /// write a sysex message
-       void write_sysex( const MidiByteArray & mba );
-       void write_sysex( MIDI::byte msg );
+    MIDI::Port& input_port() const { return *_input_port; }
+    MIDI::Port& output_port() const { return *_output_port; }
 
-       /// return the correct sysex header for this port
-       virtual const MidiByteArray & sysex_hdr() const = 0;
+    XMLNode& get_state ();
+    int set_state (const XMLNode&, int version);
 
-       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; }
-       
-       // all control notofications are sent from here
-       PBD::Signal3<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
-       PBD::Signal0<void> init_event;
-       
-       // emitted when the port completes initialisation successfully
-       PBD::Signal0<void> active_event;
-
-       // emitted when the port goes inactive (ie a read or write failed)
-       PBD::Signal0<void> inactive_event;
-       
-       // the port number - master is 0(extenders are 1((,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; }
-       
 protected:
-       /// Only for use by DummyPort
-       SurfacePort();
-       
-private:
-       MIDI::Port * _input_port;
-       MIDI::Port * _output_port;
-       int _number;
-       bool _active;
 
-       Glib::RecMutex _rwlock;
+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 );
+std::ostream& operator <<  (std::ostream& , const SurfacePort& port);
 
 }