improve AU Latency PropertyChange Events

[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 fde8110c19e2dc1926e38135a9678b689a09c343..96a50ab198df1c18136d396197e768e30be55af3 100644 (file)
--- 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
@@ -30,12 +30,12 @@
 #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"
 
@@ -51,14 +51,14 @@ 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 read (MIDI::byte *buf, size_t bufsize);
        /* waits for output to be cleared */
-       void drain (int check_interval_usecs);
+        void drain (int check_interval_usecs, int total_usecs_to_wait);
 
        /* clears async request communication channel */
        void clear () {
@@ -77,20 +77,20 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
        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;
+        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;