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

Change reload to re-scan and refactor

Browse source 
Remove rt midi reinitialization (not needed as per docs)
Move midi rescan code to rescanMidiDevices as MIDI is not audio (rescanAudioDevices also appears to be unused)
This commit is contained in:
Daniel Konar 2023-12-28 10:11:30 +01:00 committed by tildearrow
parent 049088f77c
commit 3039ce2416
4 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/audio/midi.cpp
View file

@ -59,9 +59,3 @@ void TAAudio::quitMidi() {
midiOut=NULL;
}
}
bool TAAudio::reinitMidi(bool jack) {
quitMidi();
return initMidi(jack);
}

2
src/audio/taAudio.h
View file

@ -178,8 +178,6 @@ class TAAudio {
virtual std::vector<String> listAudioDevices();
bool initMidi(bool jack);
void quitMidi();
/** remove and reload midi to allow hotswaping midi devices */
bool reinitMidi(bool jack);
virtual bool init(TAAudioDesc& request, TAAudioDesc& response);
TAAudio():

15
src/engine/engine.cpp
View file

@ -3464,6 +3464,12 @@ void DivEngine::rescanAudioDevices() {
audioDevs.clear();
if (output!=NULL) {
audioDevs=output->listAudioDevices();
}
}
void DivEngine::rescanMidiDevices() {
if (output!=NULL) {
logV("re-scanning midi...");
if (output->midiIn!=NULL) {
midiIns=output->midiIn->listDevices();
}
@ -3473,15 +3479,6 @@ void DivEngine::rescanAudioDevices() {
}
}
void DivEngine::rescanMidiDevices() {
if (output!=NULL) {
logV("reloading midi...");
output->reinitMidi(false);
rescanAudioDevices();
}
}
void DivEngine::initDispatch(bool isRender) {
BUSY_BEGIN;
logV("initializing dispatch...");

2
src/gui/settings.cpp
View file

@ -1130,7 +1130,7 @@ void FurnaceGUI::drawSettings() {
}
ImGui::SameLine();
if (ImGui::Button("Reload MIDI devices")) {
if (ImGui::Button("Re-scan MIDI devices")) {
e->rescanMidiDevices();
audioEngineChanged=true;
settingsChanged=false;