otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

and more MIDI input refinements

Browse source
This commit is contained in:
tildearrow 2022-04-01 02:21:10 -05:00
parent 052dcb2576
commit 4b436ef1fc
4 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/engine/engine.cpp
View file

@ -2673,6 +2673,10 @@ void DivEngine::setMidiBaseChan(int chan) {
midiBaseChan=chan;
}
void DivEngine::setMidiDirect(bool value) {
midiIsDirect=value;
}
void DivEngine::setMidiCallback(std::function<int(const TAMidiMessage&)> what) {
midiCallback=what;
}

5
src/engine/engine.h
View file

@ -196,6 +196,7 @@ class DivEngine {
bool softLocked;
bool firstTick;
bool skipping;
bool midiIsDirect;
int softLockCount;
int ticks, curRow, curOrder, remainingLoops, nextSpeed;
double divider;
@ -650,6 +651,9 @@ class DivEngine {
// set MIDI base channel
void setMidiBaseChan(int chan);
// set MIDI direct channel map
void setMidiDirect(bool value);
// set MIDI input callback
// if the specified function returns -2, note feedback will be inhibited.
void setMidiCallback(std::function<int(const TAMidiMessage&)> what);
@ -715,6 +719,7 @@ class DivEngine {
softLocked(false),
firstTick(false),
skipping(false),
midiIsDirect(false),
softLockCount(0),
ticks(0),
curRow(0),

18
src/engine/playback.cpp
View file

@ -1597,7 +1597,11 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
switch (msg.type&0xf0) {
case TA_MIDI_NOTE_OFF: {
if (chan<0 || chan>=chans) break;
autoNoteOff(msg.type&15,msg.data[0]-12,msg.data[1]);
if (midiIsDirect) {
pendingNotes.push(DivNoteEvent(chan,-1,-1,-1,false));
} else {
autoNoteOff(msg.type&15,msg.data[0]-12,msg.data[1]);
}
if (!playing) {
reset();
freelance=true;
@ -1608,9 +1612,17 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
case TA_MIDI_NOTE_ON: {
if (chan<0 || chan>=chans) break;
if (msg.data[1]==0) {
autoNoteOff(msg.type&15,msg.data[0]-12,msg.data[1]);
if (midiIsDirect) {
pendingNotes.push(DivNoteEvent(chan,-1,-1,-1,false));
} else {
autoNoteOff(msg.type&15,msg.data[0]-12,msg.data[1]);
}
} else {
autoNoteOn(msg.type&15,ins,msg.data[0]-12,msg.data[1]);
if (midiIsDirect) {
pendingNotes.push(DivNoteEvent(chan,ins,msg.data[0]-12,msg.data[1],true));
} else {
autoNoteOn(msg.type&15,ins,msg.data[0]-12,msg.data[1]);
}
}
break;
}