Merge pull request #218 from EmerickH/master

Fix MIDI lag and disconnect on module disable
benkuper · Feb 16, 2024 · d2ed464 · d2ed464
2 parents 5f546ed + 641c495
commit d2ed464
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/Source/Common/MIDI/MIDIDevice.cpp b/Source/Common/MIDI/MIDIDevice.cpp
@@ -132,7 +132,7 @@ void MIDIOutputDevice::close()
 	if (usageCount == 0)
 	{
 		device = nullptr;
-		LOG("MIDI In " << name << " closed");
+		LOG("MIDI Out " << name << " closed");
 	}
 }
 

diff --git a/Source/Common/MIDI/MIDIManager.cpp b/Source/Common/MIDI/MIDIManager.cpp
@@ -18,7 +18,6 @@ MIDIManager::MIDIManager()
 	midiRouterDefaultType = dynamic_cast<ChataigneEngine*>(Engine::mainEngine)->defaultBehaviors.addEnumParameter("MIDI Router Ouput Type", "Choose the default type when choosing a MIDI Module as Router output");
 	midiRouterDefaultType->addOption("Control Change", MIDIManager::CONTROL_CHANGE)->addOption("Note On", MIDIManager::NOTE_ON)->addOption("Note Off", MIDIManager::NOTE_OFF);
 
-	startTimer(500); //check devices each half seconds
 	checkDevices();
 }
 
@@ -180,8 +179,3 @@ MIDIOutputDevice* MIDIManager::getOutputDeviceWithName(const String& name)
 	for (auto& d : outputs) if (d->name == name) return d;
 	return nullptr;
 }
-
-void MIDIManager::timerCallback()
-{
-	checkDevices();
-}
diff --git a/Source/Common/MIDI/MIDIManager.h b/Source/Common/MIDI/MIDIManager.h
@@ -10,8 +10,7 @@
 
 #pragma once
 
-class MIDIManager :
-	public Timer
+class MIDIManager
 {
 public:
 	juce_DeclareSingleton(MIDIManager, true)
@@ -55,14 +54,15 @@ class MIDIManager :
 	void removeMIDIManagerListener(Listener* listener) { listeners.remove(listener); }
 
 
-
-	// Inherited via Timer
-	virtual void timerCallback() override;
-
 	static String getNoteName(const int& pitch, bool includeOctave = true, int octaveShift = 0)
 	{
 		return MidiMessage::getMidiNoteName(pitch, true, includeOctave, 3 - octaveShift);
 	}
 
+	MidiDeviceListConnection connection = MidiDeviceListConnection::make ([this]
+	{
+        checkDevices();
+	});
+
 	JUCE_DECLARE_NON_COPYABLE(MIDIManager)
 };
diff --git a/Source/Module/modules/midi/MIDIModule.cpp b/Source/Module/modules/midi/MIDIModule.cpp
@@ -297,11 +297,23 @@ void MIDIModule::onControllableFeedbackUpdateInternal(ControllableContainer* cc,
 	}
 }
 
+void MIDIModule::onContainerParameterChangedInternal(Parameter* p)
+{
+	Module::onContainerParameterChangedInternal(p);
+	if (p == enabled){
+		updateMIDIDevices();
+	}
+}
+
 void MIDIModule::updateMIDIDevices()
 {
-	MIDIInputDevice* newInput = midiParam->inputDevice;
-	//if (inputDevice != newInput)
-	//{
+	MIDIInputDevice* newInput = nullptr;
+	MIDIOutputDevice* newOutput = nullptr;
+	if (enabled->boolValue()){
+		newInput = midiParam->inputDevice;
+		newOutput = midiParam->outputDevice;
+	}
+
 	if (inputDevice != nullptr)
 	{
 		inputDevice->removeMIDIInputListener(this);
@@ -317,11 +329,7 @@ void MIDIModule::updateMIDIDevices()
 		mtcReceiver->addMTCListener(this);
 		noteOns.clear();
 	}
-	//}
 
-	MIDIOutputDevice* newOutput = midiParam->outputDevice;
-	//if (outputDevice != newOutput)
-	//{
 	if (outputDevice != nullptr)
 	{
 		if (sendClock->boolValue()) outClock.setOutDevice(nullptr);

diff --git a/Source/Module/modules/midi/MIDIModule.h b/Source/Module/modules/midi/MIDIModule.h
@@ -151,6 +151,7 @@ class MIDIModule :
 	void sendMidiMachineControlGoto(int hours, int minutes, int seconds, int frames);
 
 	void onControllableFeedbackUpdateInternal(ControllableContainer* cc, Controllable* c) override;
+	virtual void onContainerParameterChangedInternal(Parameter* p) override;
 	void updateMIDIDevices();
 
 	virtual void noteOnReceived(const int& channel, const int& pitch, const int& velocity) override;