X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fasync_midi_port.h;h=96a50ab198df1c18136d396197e768e30be55af3;hb=e845b9f9357c4ff471c02b1f63a61275bb4a7d28;hp=e7eeb8ee30a15327b94bd05d854d63610eb32600;hpb=36c233fe6ce570ce85224626ce7aba4a2607537f;p=ardour.git

diff --git a/libs/ardour/ardour/async_midi_port.h b/libs/ardour/ardour/async_midi_port.h
index e7eeb8ee30..96a50ab198 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,18 +22,20 @@
 #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"
 
@@ -49,28 +51,55 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
 
 	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 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(); }
+	/* 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<framecnt_t (void)>&);
 
 	static void set_process_thread (pthread_t);
 	static pthread_t get_process_thread () { return _process_thread; }
 	static bool is_process_thread();
 
-  private:	
+  private:
 	bool                    _currently_in_cycle;
         MIDI::timestamp_t       _last_write_timestamp;
+	bool                    have_timer;
+	boost::function<framecnt_t (void)> timer;
 	RingBuffer< Evoral::Event<double> > output_fifo;
-        Evoral::EventRingBuffer<MIDI::timestamp_t> input_fifo;
-        Glib::Threads::Mutex    output_fifo_lock;
-	CrossThreadChannel      xthread;
+        EventRingBuffer<MIDI::timestamp_t> input_fifo;
+        Glib::Threads::Mutex output_fifo_lock;
+	CrossThreadChannel _xthread;
+
+	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);
+    void flush_output_fifo (pframes_t);
 
 	static pthread_t _process_thread;
 };