diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index ca6c60de1..87c10ce4c 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -315,7 +315,7 @@ writing audio. #define MIDI_SLEEP 10 /* milliseconds */ #define ROUND(x) (int) ((x)+0.5) //#include - #include "portmidi.h" + #include "../lib-src/portmidi/pm_common/portmidi.h" #include "../lib-src/portaudio-v19/src/common/pa_util.h" #include "NoteTrack.h" #endif diff --git a/src/AudioIO.h b/src/AudioIO.h index 1c2335da9..aab33bce6 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -23,10 +23,12 @@ #ifdef USE_MIDI +// TODO: Put the relative paths into automake. + #ifdef EXPERIMENTAL_MIDI_OUT -#include "portmidi.h" -#include "porttime.h" -#include "allegro.h" +#include "../lib-src/portmidi/pm_common/portmidi.h" +#include "../lib-src/portmidi/porttime/porttime.h" +#include "../lib-src/portsmf/allegro.h" class NoteTrack; using NoteTrackArray = std::vector < NoteTrack* >; @@ -36,7 +38,7 @@ using NoteTrackArray = std::vector < NoteTrack* >; #endif // USE_MIDI #if USE_PORTMIXER -#include "portmixer.h" +#include "../lib-src/portmixer/include/portmixer.h" #endif #include diff --git a/src/Experimental.h b/src/Experimental.h index 745537e1b..8fd4a9a08 100644 --- a/src/Experimental.h +++ b/src/Experimental.h @@ -114,7 +114,9 @@ // Enables MIDI Output of NoteTrack (MIDI) data during playback // USE_MIDI must be defined in order for EXPERIMENTAL_MIDI_OUT to work #ifdef USE_MIDI -//#define EXPERIMENTAL_MIDI_OUT +#ifdef __WXMSW__ + #define EXPERIMENTAL_MIDI_OUT +#endif #endif // USE_MIDI must be defined in order for EXPERIMENTAL_SCOREALIGN to work diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index 0f46a6541..b457b9edf 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -37,7 +37,7 @@ #include "InconsistencyException.h" #ifdef SONIFY -#include "portmidi.h" +#include "../lib-src/portmidi/pm_common/portmidi.h" #define SON_PROGRAM 0 #define SON_AutoSave 67 diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 5d3b3d63f..06910194e 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -32,7 +32,7 @@ other settings. #include #include -#include "portmidi.h" +#include "../../lib-src/portmidi/pm_common/portmidi.h" #include "../AudioIO.h" #include "../Internat.h"