X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fasync_midi_port.h;h=3639304f7783ff603f78702f9a3f566abc814430;hb=8a4518d76fe78e5fb99900ff5ff71a22e5912395;hp=76bdac04095ab5272882eb1377bdb7597e7e400b;hpb=917aed0da0628107b8db0df18446e1ed5f5dc3b8;p=ardour.git

diff --git a/libs/ardour/ardour/async_midi_port.h b/libs/ardour/ardour/async_midi_port.h
index 76bdac0409..3639304f77 100644
--- a/libs/ardour/ardour/async_midi_port.h
+++ b/libs/ardour/ardour/async_midi_port.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1998-2010 Paul Barton-Davis 
+    Copyright (C) 1998-2010 Paul Barton-Davis
     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
@@ -22,56 +22,87 @@
 #include <string>
 #include <iostream>
 
+#include <boost/function.hpp>
+
 #include "pbd/xml++.h"
 #include "pbd/crossthread.h"
 #include "pbd/signals.h"
 #include "pbd/ringbuffer.h"
 
 #include "evoral/Event.hpp"
-#include "evoral/EventRingBuffer.hpp"
 
 #include "midi++/types.h"
 #include "midi++/parser.h"
 #include "midi++/port.h"
 
+#include "ardour/event_ring_buffer.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);
+		~AsyncMIDIPort ();
+
+		bool flush_at_cycle_start () const { return _flush_at_cycle_start; }
+		void set_flush_at_cycle_start (bool en) { _flush_at_cycle_start = en; }
+
+		/* called from an RT context */
+		void cycle_start (pframes_t nframes);
+		void cycle_end (pframes_t nframes);
+
+		/* called from non-RT context */
+		void parse (samplecnt_t timestamp);
+		int write (const MIDI::byte *msg, size_t msglen, MIDI::timestamp_t timestamp);
+		int read (MIDI::byte *buf, size_t bufsize);
+		/* waits for output to be cleared */
+		void drain (int check_interval_usecs, int total_usecs_to_wait);
+
+		/* clears async request communication channel */
+		void clear () {
+			_xthread.drain ();
+		}
+
+		CrossThreadChannel& xthread() {
+			return _xthread;
+		}
+
+		/* Not selectable; use ios() */
+		int selectable() const { return -1; }
+		void set_timer (boost::function<samplecnt_t (void)>&);
 
-  public:
-        AsyncMIDIPort (std::string const &, PortFlags);
-	~AsyncMIDIPort ();
+		static void set_process_thread (pthread_t);
+		static pthread_t get_process_thread () { return _process_thread; }
+		static bool is_process_thread();
 
-        /* called from an RT context */
+	private:
+		bool                    _currently_in_cycle;
+		MIDI::timestamp_t       _last_write_timestamp;
+		bool                    _flush_at_cycle_start;
+		bool                    have_timer;
+		boost::function<samplecnt_t (void)> timer;
+		PBD::RingBuffer< Evoral::Event<double> > output_fifo;
+		EventRingBuffer<MIDI::timestamp_t> input_fifo;
+		Glib::Threads::Mutex output_fifo_lock;
+		CrossThreadChannel _xthread;
 
-	void cycle_start (pframes_t nframes);
-	void cycle_end (pframes_t nframes);
-    
-        /* called from non-RT context */
-    
-	void parse (framecnt_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 create_port ();
 
-	static void set_process_thread (pthread_t);
-	static pthread_t get_process_thread () { return _process_thread; }
-	static bool is_process_thread();
+		/** Channel used to signal to the MidiControlUI that input has arrived */
 
-  private:	
-	bool                    _currently_in_cycle;
-        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;
+		std::string _connections;
+		PBD::ScopedConnection connect_connection;
+		PBD::ScopedConnection halt_connection;
+		void jack_halted ();
+		void make_connections ();
+		void init (std::string const &, Flags);
 
-        void flush_output_fifo (pframes_t);
+		void flush_output_fifo (pframes_t);
 
-	static pthread_t _process_thread;
+		static pthread_t _process_thread;
 };
 
 } // namespace ARDOUR