integrate Session::remove_routes() from Tracks and replace Session::remove_route...

[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 d822081bd306b598d48f81e4660aa461be6b5a9a..cbe9bb1a9c73ee762c33304ae275e9ea4d81f04a 100644 (file)
--- a/libs/ardour/ardour/async_midi_port.h
+++ b/libs/ardour/ardour/async_midi_port.h
@@ -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"
 
@@ -62,20 +62,15 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
 
        /* clears async request communication channel */
        void clear () {
-#ifndef PLATFORM_WINDOWS
-               return xthread.drain ();
-#endif
+               _xthread.drain ();
        }
+
+        CrossThreadChannel& xthread() {
+                return _xthread;
+        }
+
        /* Not selectable; use ios() */
        int selectable() const { return -1; }
-
-       Glib::RefPtr<Glib::IOSource> ios() {
-#ifndef PLATFORM_WINDOWS
-               return xthread.ios();
-#else
-               return Glib::RefPtr<Glib::IOSource>(0);
-#endif
-       }
        void set_timer (boost::function<framecnt_t (void)>&);
 
        static void set_process_thread (pthread_t);
@@ -88,11 +83,9 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
        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;
-#ifndef PLATFORM_WINDOWS
-       CrossThreadChannel xthread;
-#endif
+       CrossThreadChannel _xthread;
 
        int create_port ();
 
@@ -106,7 +99,7 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
        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;
 };