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

more work

Browse source
This commit is contained in:
tildearrow 2022-03-28 18:19:47 -05:00
parent 81319e34bc
commit 4825fe7adb
5 changed files with 57 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/engine/engine.cpp
View file

@ -2621,7 +2621,7 @@ bool DivEngine::switchMaster() {
return true;
}
void DivEngine::setMidiCallback(std::function<bool(const TAMidiMessage&)> what) {
void DivEngine::setMidiCallback(std::function<int(const TAMidiMessage&)> what) {
midiCallback=what;
}

7
src/engine/engine.h
View file

@ -244,7 +244,8 @@ class DivEngine {
size_t totalProcessed;
std::function<bool(const TAMidiMessage&)> midiCallback=[](const TAMidiMessage&) -> bool {return false;};
// MIDI stuff
std::function<int(const TAMidiMessage&)> midiCallback=[](const TAMidiMessage&) -> int {return -1;};
DivSystem systemFromFile(unsigned char val);
unsigned char systemToFile(DivSystem val);
@ -638,8 +639,8 @@ class DivEngine {
bool switchMaster();
// set MIDI input callback
// if the specified function returns true, note feedback will be inhibited.
void setMidiCallback(std::function<bool(const TAMidiMessage&)> what);
// if the specified function returns -2, note feedback will be inhibited.
void setMidiCallback(std::function<int(const TAMidiMessage&)> what);
// perform secure/sync operation
void synchronized(const std::function<void()>& what);

19
src/engine/playback.cpp
View file

@ -1541,17 +1541,32 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
// process MIDI events (TODO: everything)
if (output->midiIn) while (!output->midiIn->queue.empty()) {
TAMidiMessage& msg=output->midiIn->queue.front();
if (!midiCallback(msg)) {
int ins=-1;
if ((ins=midiCallback(msg))!=-2) {
int chan=msg.type&15;
switch (msg.type&0xf0) {
case TA_MIDI_NOTE_OFF: {
if (chan<0 || chan>=chans) break;
pendingNotes.push(DivNoteEvent(msg.type&15,-1,-1,-1,false));
if (!playing) {
reset();
freelance=true;
playing=true;
}
break;
}
case TA_MIDI_NOTE_ON: {
if (chan<0 || chan>=chans) break;
pendingNotes.push(DivNoteEvent(msg.type&15,-1,(int)msg.data[0]-12,msg.data[1],true));
if (msg.data[1]==0) {
pendingNotes.push(DivNoteEvent(msg.type&15,-1,-1,-1,false));
} else {
pendingNotes.push(DivNoteEvent(msg.type&15,ins,(int)msg.data[0]-12,msg.data[1],true));
}
if (!playing) {
reset();
freelance=true;
playing=true;
}
break;
}
case TA_MIDI_PROGRAM: {