aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Novichkov <admin@wohlnet.ru>2018-06-21 04:43:55 +0300
committerVitaly Novichkov <admin@wohlnet.ru>2018-06-21 04:43:55 +0300
commitb9304bc1342ccfa645ffb422fbaad1965e64178f (patch)
treee6af1541ecff3b5acfad51d300a83de59e00e53f
parent51ffa56a7f30679ecb40d76725a94b9c954546a1 (diff)
downloadlibADLMIDI-b9304bc1342ccfa645ffb422fbaad1965e64178f.tar.gz
libADLMIDI-b9304bc1342ccfa645ffb422fbaad1965e64178f.tar.bz2
libADLMIDI-b9304bc1342ccfa645ffb422fbaad1965e64178f.zip
Second attempt to fix Windows build
-rw-r--r--src/midi_sequencer.hpp2
-rw-r--r--src/midi_sequencer_impl.hpp22
2 files changed, 12 insertions, 12 deletions
diff --git a/src/midi_sequencer.hpp b/src/midi_sequencer.hpp
index 370068b..a8e04d0 100644
--- a/src/midi_sequencer.hpp
+++ b/src/midi_sequencer.hpp
@@ -351,7 +351,7 @@ public:
* @brief Sets the RT interface
* @param interface Pre-Initialized interface structure (pointer will be taken)
*/
- void setInterface(const BW_MidiRtInterface *interface);
+ void setInterface(const BW_MidiRtInterface *intrf);
/**
* @brief Returns file format type of currently loaded file
diff --git a/src/midi_sequencer_impl.hpp b/src/midi_sequencer_impl.hpp
index 1e4e643..1d627fe 100644
--- a/src/midi_sequencer_impl.hpp
+++ b/src/midi_sequencer_impl.hpp
@@ -252,29 +252,29 @@ BW_MidiSequencer::BW_MidiSequencer() :
BW_MidiSequencer::~BW_MidiSequencer()
{}
-void BW_MidiSequencer::setInterface(const BW_MidiRtInterface *interface)
+void BW_MidiSequencer::setInterface(const BW_MidiRtInterface *intrf)
{
// Interface must NOT be NULL
- assert(interface);
+ assert(intrf);
//Note ON hook is REQUIRED
- assert(interface->rt_noteOn);
+ assert(intrf->rt_noteOn);
//Note OFF hook is REQUIRED
- assert(interface->rt_noteOff);
+ assert(intrf->rt_noteOff);
//Note Aftertouch hook is REQUIRED
- assert(interface->rt_noteAfterTouch);
+ assert(intrf->rt_noteAfterTouch);
//Channel Aftertouch hook is REQUIRED
- assert(interface->rt_channelAfterTouch);
+ assert(intrf->rt_channelAfterTouch);
//Controller change hook is REQUIRED
- assert(interface->rt_controllerChange);
+ assert(intrf->rt_controllerChange);
//Patch change hook is REQUIRED
- assert(interface->rt_patchChange);
+ assert(intrf->rt_patchChange);
//Pitch bend hook is REQUIRED
- assert(interface->rt_pitchBend);
+ assert(intrf->rt_pitchBend);
//System Exclusive hook is REQUIRED
- assert(interface->rt_systemExclusive);
+ assert(intrf->rt_systemExclusive);
- m_interface = interface;
+ m_interface = intrf;
}
BW_MidiSequencer::FileFormat BW_MidiSequencer::getFormat()