summaryrefslogtreecommitdiff
path: root/libs/midi++2/midi++
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-07-13 08:26:54 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-07-13 08:26:54 -0400
commiteddcc868ba7786a7039edd1a96acbcac83499007 (patch)
tree7e4440db4de7aaeb1e6a905e37414d20f794cd19 /libs/midi++2/midi++
parenta0ada1f233acc153f92e86e3cb73d34b009c82d0 (diff)
Disable non-realtime midi ports in windows build - THIS NEEDS FIXING
Diffstat (limited to 'libs/midi++2/midi++')
-rw-r--r--libs/midi++2/midi++/jack_midi_port.h10
-rw-r--r--libs/midi++2/midi++/port.h2
2 files changed, 11 insertions, 1 deletions
diff --git a/libs/midi++2/midi++/jack_midi_port.h b/libs/midi++2/midi++/jack_midi_port.h
index a8859387a4..f91c7dab83 100644
--- a/libs/midi++2/midi++/jack_midi_port.h
+++ b/libs/midi++2/midi++/jack_midi_port.h
@@ -57,7 +57,13 @@ class JackMIDIPort : public Port {
int write (const byte *msg, size_t msglen, timestamp_t timestamp);
int read (byte *buf, size_t bufsize);
void drain (int check_interval_usecs);
- int selectable () const { return xthread.selectable(); }
+ int selectable () const {
+#ifdef WIN32
+ return false;
+#else
+ return xthread.selectable();
+#endif
+ }
pframes_t nframes_this_cycle() const { return _nframes_this_cycle; }
@@ -80,7 +86,9 @@ private:
RingBuffer< Evoral::Event<double> > output_fifo;
Evoral::EventRingBuffer<timestamp_t> input_fifo;
Glib::Threads::Mutex output_fifo_lock;
+#ifndef WIN32
CrossThreadChannel xthread;
+#endif
int create_port ();
diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h
index 439760115c..d4f03b593e 100644
--- a/libs/midi++2/midi++/port.h
+++ b/libs/midi++2/midi++/port.h
@@ -27,7 +27,9 @@
#include <pthread.h>
#include "pbd/xml++.h"
+#ifndef WIN32
#include "pbd/crossthread.h"
+#endif
#include "pbd/signals.h"
#include "pbd/ringbuffer.h"