Merge branch 'master' into cairocanvas

[ardour.git] / libs / ardour / ardour / async_midi_port.h

diff --git a/libs/ardour/ardour/async_midi_port.h b/libs/ardour/ardour/async_midi_port.h
index 76bdac04095ab5272882eb1377bdb7597e7e400b..c5babf6135c3bbda22b9310d980bede82a2e3120 100644 (file)
--- a/libs/ardour/ardour/async_midi_port.h
+++ b/libs/ardour/ardour/async_midi_port.h
@@ -34,11 +34,12 @@
 #include "midi++/parser.h"
 #include "midi++/port.h"
 
+#include "ardour/libardour_visibility.h"
 #include "ardour/midi_port.h"
 
 namespace ARDOUR {
 
-       class AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
+class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
 
   public:
         AsyncMIDIPort (std::string const &, PortFlags);
@@ -52,10 +53,16 @@ namespace ARDOUR {
         /* called from non-RT context */
     
        void parse (framecnt_t timestamp);
-        int write (const MIDI::byte *msg, size_t msglen, MIDI::timestamp_t timestamp);
+       int write (const MIDI::byte *msg, size_t msglen, MIDI::timestamp_t timestamp);
         int read (MIDI::byte *buf, size_t bufsize);
        void drain (int check_interval_usecs);
-       int selectable () const { return xthread.selectable(); }
+       int selectable () const {
+#ifdef PLATFORM_WINDOWS
+               return false;
+#else
+               return xthread.selectable();
+#endif
+       }
 
        static void set_process_thread (pthread_t);
        static pthread_t get_process_thread () { return _process_thread; }
@@ -66,8 +73,22 @@ namespace ARDOUR {
         MIDI::timestamp_t       _last_write_timestamp;
        RingBuffer< Evoral::Event<double> > output_fifo;
         Evoral::EventRingBuffer<MIDI::timestamp_t> input_fifo;
-        Glib::Threads::Mutex    output_fifo_lock;
-       CrossThreadChannel      xthread;
+        Glib::Threads::Mutex output_fifo_lock;
+#ifndef PLATFORM_WINDOWS
+       CrossThreadChannel xthread;
+#endif
+
+       int create_port ();
+
+       /** Channel used to signal to the MidiControlUI that input has arrived */
+       
+       std::string _connections;
+       PBD::ScopedConnection connect_connection;
+       PBD::ScopedConnection halt_connection;
+       void flush (void* jack_port_buffer);
+       void jack_halted ();
+       void make_connections ();
+       void init (std::string const &, Flags);
 
         void flush_output_fifo (pframes_t);