ardour/livetrax
13
0
Fork 0
Code

alter Async MIDI port implementation to use crossthreadchannel on all platforms

Browse Source
This commit is contained in:
Paul Davis 2014-12-03 20:53:49 -05:00
parent f72b87b448
commit d762ed8c22
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/ardour/ardour/async_midi_port.h
View File

@ -30,13 +30,13 @@
#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/libardour_visibility.h"
#include "ardour/event_ring_buffer.h"
#include "ardour/midi_port.h"
namespace ARDOUR {
@ -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;
EventRingBuffer<MIDI::timestamp_t> input_fifo;
Evoral::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;
};

12
libs/ardour/async_midi_port.cc
View File

@ -37,6 +37,10 @@ using namespace ARDOUR;
using namespace std;
using namespace PBD;
namespace Evoral {
template class EventRingBuffer<MIDI::timestamp_t>;
}
pthread_t AsyncMIDIPort::_process_thread;
#define port_engine AudioEngine::instance()->port_engine()
@ -49,9 +53,7 @@ AsyncMIDIPort::AsyncMIDIPort (string const & name, PortFlags flags)
, have_timer (false)
, output_fifo (512)
, input_fifo (1024)
#ifndef PLATFORM_WINDOWS
, xthread (true)
#endif
, _xthread (true)
{
}
@ -132,11 +134,9 @@ AsyncMIDIPort::cycle_start (MIDI::pframes_t nframes)
input_fifo.write (when, (Evoral::EventType) 0, (*b).size(), (*b).buffer());
}
#ifndef PLATFORM_WINDOWS
if (!mb.empty()) {
xthread.wakeup ();
_xthread.wakeup ();
}
#endif
}
}