ardour/livetrax
13
0
Fork 0
Code

hotfix windows-compilation (unfinished bfe49540b9)

Browse Source 
..at least it compiles and starts. Mackie support etc
is probably still broken.
This commit is contained in:
Robin Gareus 2014-11-23 23:56:39 +01:00
parent 1b6cbf743b
commit cd91fa0046
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,13 +62,19 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
/* clears async request communication channel */ /* clears async request communication channel */
void clear () { void clear () {
#ifndef PLATFORM_WINDOWS
return xthread.drain (); return xthread.drain ();
#endif
} }
/* Not selectable; use ios() */ /* Not selectable; use ios() */
int selectable() const { return -1; } int selectable() const { return -1; }
Glib::RefPtr<Glib::IOSource> ios() { Glib::RefPtr<Glib::IOSource> ios() {
#ifndef PLATFORM_WINDOWS
return xthread.ios(); return xthread.ios();
#else
return Glib::RefPtr<Glib::IOSource>(0);
#endif
} }
void set_timer (boost::function<framecnt_t (void)>&); void set_timer (boost::function<framecnt_t (void)>&);
@ -84,7 +90,9 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
RingBuffer< Evoral::Event<double> > output_fifo; RingBuffer< Evoral::Event<double> > output_fifo;
Evoral::EventRingBuffer<MIDI::timestamp_t> input_fifo; Evoral::EventRingBuffer<MIDI::timestamp_t> input_fifo;
Glib::Threads::Mutex output_fifo_lock; Glib::Threads::Mutex output_fifo_lock;
#ifndef PLATFORM_WINDOWS
CrossThreadChannel xthread; CrossThreadChannel xthread;
#endif
int create_port (); int create_port ();