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 8b66073b4af71dedb988cfef5004b6cb7fe2561b..b361294fa91c6f14a9fcc4a204dc3d0955a3d679 100644 (file)
--- a/libs/surfaces/mackie/surface_port.h
+++ b/libs/surfaces/mackie/surface_port.h
@@ -19,19 +19,25 @@
 #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;
 }
 
 class MackieControlProtocol;
 
+namespace ARDOUR {
+       class AsyncMIDIPort;
+       class Port;
+}
+
 namespace Mackie
 {
 
@@ -44,42 +50,26 @@ class Surface;
 class SurfacePort 
 {
 public:
-       SurfacePort (Mackie::Surface&, MIDI::Port& input_port, MIDI::Port& output_port);
-       virtual ~SurfacePort();
+    SurfacePort (Mackie::Surface&);
+    virtual ~SurfacePort();
+    
+    /// an easier way to output bytes via midi
+    int write (const MidiByteArray&);
        
-       void open();
-       void close();
+    MIDI::Port& input_port() const { return *_input_port; }
+    MIDI::Port& output_port() const { return *_output_port; }
 
-       /// 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();
-       
-       /// an easier way to output bytes via midi
-       void 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; }
-
-       // emitted when the port goes inactive (ie a read or write failed)
-       PBD::Signal0<void> inactive_event;
-       
-       void handle_midi_sysex (MIDI::Parser&, MIDI::byte *, size_t count);
-
-       bool active() const { return _active; }
+    XMLNode& get_state ();
+    int set_state (const XMLNode&, int version);
 
 protected:
-       MidiByteArray host_connection_query (MidiByteArray& bytes);
-       MidiByteArray host_connection_confirmation (const MidiByteArray& bytes);
 
 private:
-       Mackie::Surface* _surface;
-       MIDI::Port*      _input_port;
-       MIDI::Port*      _output_port;
-       bool             _active;
-
-       PBD::ScopedConnection sysex_connection;
+    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);