diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-21 05:01:50 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-21 05:01:50 +0300 |
| commit | f20f618327deba5091a384eb749fd4b4f7c10a2f (patch) | |
| tree | c1af15b9260aadce457732b3fd2e2ab39aaa469b | |
| parent | 96fef8f4aa43bc60b54e765da20d465a6830e0c7 (diff) | |
| download | libADLMIDI-f20f618327deba5091a384eb749fd4b4f7c10a2f.tar.gz libADLMIDI-f20f618327deba5091a384eb749fd4b4f7c10a2f.tar.bz2 libADLMIDI-f20f618327deba5091a384eb749fd4b4f7c10a2f.zip | |
Fixed build of MIDI sequencer out of pre-included private ADLMIDI's header
| -rw-r--r-- | src/adlmidi_private.hpp | 2 | ||||
| -rw-r--r-- | src/adlmidi_sequencer.cpp | 5 | ||||
| -rw-r--r-- | src/midi_sequencer_impl.hpp | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 446bae0..06d21ab 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -134,7 +134,7 @@ typedef int32_t ssize_t; #include "file_reader.hpp" #ifndef ADLMIDI_DISABLE_MIDI_SEQUENCER -// Rename class to avoid ABI conflicts +// Rename class to avoid ABI collisions #define BW_MidiSequencer AdlMidiSequencer #include "midi_sequencer.hpp" typedef BW_MidiSequencer MidiSequencer; diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp index 8bc3569..fcc1380 100644 --- a/src/adlmidi_sequencer.cpp +++ b/src/adlmidi_sequencer.cpp @@ -23,11 +23,12 @@ #ifndef ADLMIDI_DISABLE_MIDI_SEQUENCER -#include "adlmidi_private.hpp" - +// Rename class to avoid ABI collisions +#define BW_MidiSequencer AdlMidiSequencer // Inlucde MIDI sequencer class implementation #include "midi_sequencer_impl.hpp" +#include "adlmidi_private.hpp" /**************************************************** * Real-Time MIDI calls proxies * diff --git a/src/midi_sequencer_impl.hpp b/src/midi_sequencer_impl.hpp index 1d627fe..8c0e3dd 100644 --- a/src/midi_sequencer_impl.hpp +++ b/src/midi_sequencer_impl.hpp @@ -26,6 +26,7 @@ #include <stdio.h> #include <memory> #include <cstring> +#include <set> #include <assert.h> |