small changes recommended by Soyersoyer

penfold42 · penfold42 · commit 7ad582f75a3b · 2025-12-03T11:40:41.000+11:00
diff --git a/src/config.cpp b/src/config.cpp
@@ -123,7 +123,8 @@ void CConfig::Load (void)
 		}
 	}
 
-	m_bMIDIThruBlockSpam = m_Properties.GetNumber ("MIDIThruBlockSpam", 0) != 0;
+	m_bMIDIThruIgnoreClock = m_Properties.GetNumber ("MIDIThruIgnoreClock", 0) != 0;
+	m_bMIDIThruIgnoreActiveSensing = m_Properties.GetNumber ("MIDIThruIgnoreActiveSensing", 0) != 0;
 
 	m_bMIDIRXProgramChange = m_Properties.GetNumber ("MIDIRXProgramChange", 1) != 0;
 	m_bIgnoreAllNotesOff = m_Properties.GetNumber ("IgnoreAllNotesOff", 0) != 0;
@@ -235,8 +236,8 @@ void CConfig::Load (void)
 	if (const u8 *pIP = m_Properties.GetIPAddress("NetworkDNSServer")) m_INetworkDNSServer.Set (pIP);
 	m_bNetworkFTPEnabled = m_Properties.GetNumber("NetworkFTPEnabled", 0) != 0;
 	if (const u8 *pIP = m_Properties.GetIPAddress ("NetworkSyslogServerIPAddress")) m_INetworkSyslogServerIPAddress.Set (pIP);
-	m_bUdpMidiEnabled = m_Properties.GetNumber("UdpMidiEnabled", 0) != 0;
-	if (const u8 *pIP = m_Properties.GetIPAddress("UdpMidiIPAddress")) m_IUdpMidiIPAddress.Set (pIP);
+	m_bUDPMIDIEnabled = m_Properties.GetNumber("UDPMIDIEnabled", 0) != 0;
+	if (const u8 *pIP = m_Properties.GetIPAddress("UDPMIDIIPAddress")) m_IUDPMIDIIPAddress.Set (pIP);
 
 	m_nMasterVolume = m_Properties.GetNumber ("MasterVolume", 64);
 }
@@ -363,9 +364,14 @@ const char *CConfig::GetMIDIThru2Out (void) const
 	return m_MIDIThru2Out.c_str ();
 }
 
-bool CConfig::GetMIDIThruBlockSpam (void) const
+bool CConfig::GetMIDIThruIgnoreClock (void) const
 {
-	return m_bMIDIThruBlockSpam;
+	return m_bMIDIThruIgnoreClock;
+}
+
+bool CConfig::GetMIDIThruIgnoreActiveSensing (void) const
+{
+	return m_bMIDIThruIgnoreActiveSensing;
 }
 
 bool CConfig::GetMIDIRXProgramChange (void) const
@@ -833,12 +839,12 @@ bool CConfig::GetNetworkFTPEnabled (void) const
 	return m_bNetworkFTPEnabled;
 }
 
-bool CConfig::GetUdpMidiEnabled (void) const
+bool CConfig::GetUDPMIDIEnabled (void) const
 {
-	return m_bUdpMidiEnabled;
+	return m_bUDPMIDIEnabled;
 }
 
-const CIPAddress& CConfig::GetUdpMidiIPAddress (void) const
+const CIPAddress& CConfig::GetUDPMIDIIPAddress (void) const
 {
-	return m_IUdpMidiIPAddress;
+	return m_IUDPMIDIIPAddress;
 }
diff --git a/src/config.h b/src/config.h
@@ -126,7 +126,8 @@ class CConfig		// Configuration for MiniDexed
 	const char *GetMIDIThruOut (void) const;	// "" if not specified
 	const char *GetMIDIThru2In (void) const;	// "" if not specified
 	const char *GetMIDIThru2Out (void) const;	// "" if not specified
-	bool GetMIDIThruBlockSpam (void) const;		// false if not specified
+	bool GetMIDIThruIgnoreClock (void) const;		// false if not specified
+	bool GetMIDIThruIgnoreActiveSensing (void) const;		// false if not specified
 	bool GetMIDIRXProgramChange (void) const;	// true if not specified
 	bool GetIgnoreAllNotesOff (void) const;
 	bool GetMIDIAutoVoiceDumpOnPC (void) const; // false if not specified
@@ -257,8 +258,8 @@ class CConfig		// Configuration for MiniDexed
 	bool GetSyslogEnabled (void) const;
 	const CIPAddress& GetNetworkSyslogServerIPAddress (void) const;
 	bool GetNetworkFTPEnabled (void) const;
-	bool GetUdpMidiEnabled (void) const;
-	const CIPAddress& GetUdpMidiIPAddress (void) const;
+	bool GetUDPMIDIEnabled (void) const;
+	const CIPAddress& GetUDPMIDIIPAddress (void) const;
 
 private:
 	CPropertiesFatFsFile m_Properties;
@@ -283,7 +284,8 @@ class CConfig		// Configuration for MiniDexed
 	std::string m_MIDIThruOut;
 	std::string m_MIDIThru2In;
 	std::string m_MIDIThru2Out;
-	bool m_bMIDIThruBlockSpam;
+	bool m_bMIDIThruIgnoreClock;
+	bool m_bMIDIThruIgnoreActiveSensing;
 	bool m_bMIDIRXProgramChange;
 	bool m_bIgnoreAllNotesOff;
 	bool m_bMIDIAutoVoiceDumpOnPC;
@@ -392,8 +394,8 @@ class CConfig		// Configuration for MiniDexed
 	bool m_bSyslogEnabled;
 	CIPAddress m_INetworkSyslogServerIPAddress;
 	bool m_bNetworkFTPEnabled;
-	bool m_bUdpMidiEnabled;
-	CIPAddress m_IUdpMidiIPAddress;
+	bool m_bUDPMIDIEnabled;
+	CIPAddress m_IUDPMIDIIPAddress;
 };
 
 #endif
diff --git a/src/mididevice.cpp b/src/mididevice.cpp
@@ -189,10 +189,19 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign
 	}
 */
 
-	bool blockSpamThru = m_pConfig->GetMIDIThruBlockSpam();
 	// Handle MIDI Thru
-	bool canThru = ( (nLength > 1) || !blockSpamThru
-		|| (pMessage[0] != MIDI_TIMING_CLOCK && pMessage[0] != MIDI_ACTIVE_SENSING) );
+	bool canThru = TRUE;
+	if (nLength == 1)
+	{
+		if ((pMessage[0] == MIDI_TIMING_CLOCK) && m_pConfig->GetMIDIThruIgnoreClock())
+		{
+			canThru = FALSE;
+		}
+		if ((pMessage[0] == MIDI_ACTIVE_SENSING) && m_pConfig->GetMIDIThruIgnoreActiveSensing())
+		{
+			canThru = FALSE;
+		}
+	}
 
 	if (canThru)
 	{
diff --git a/src/udpmididevice.cpp b/src/udpmididevice.cpp
@@ -58,7 +58,7 @@ boolean CUDPMIDIDevice::Initialize (void)
 	else
 		LOGNOTE("RTP Listener initialized");
 
-	if (m_pConfig->GetUdpMidiEnabled())
+	if (m_pConfig->GetUDPMIDIEnabled())
 	{
 		m_pUDPMIDIReceiver = new CUDPMIDIReceiver(this);
 		if (!m_pUDPMIDIReceiver->Initialize())
@@ -73,9 +73,9 @@ boolean CUDPMIDIDevice::Initialize (void)
 		// UDP MIDI send socket setup (default: broadcast 255.255.255.255:1999)
 		m_UDPDestAddress.Set(0xFFFFFFFF); // Broadcast by default
 		m_UDPDestPort = 1999;
-		if (m_pConfig->GetUdpMidiIPAddress().IsSet())
+		if (m_pConfig->GetUDPMIDIIPAddress().IsSet())
 		{
-			m_UDPDestAddress.Set( m_pConfig->GetUdpMidiIPAddress() );
+			m_UDPDestAddress.Set( m_pConfig->GetUDPMIDIIPAddress() );
 		}
 		CString IPAddressString;
 		m_UDPDestAddress.Format(&IPAddressString);
@@ -127,20 +127,20 @@ void CUDPMIDIDevice::OnUDPMIDIDataReceived(const u8* pData, size_t nSize)
 void CUDPMIDIDevice::Send(const u8 *pMessage, size_t nLength, unsigned nCable)
 {
     if (m_pAppleMIDIParticipant) {
-	int res = m_pAppleMIDIParticipant->SendMIDIToHost(pMessage, nLength);
-        if (res < 0) {
-            LOGERR("Failed to send %u bytes to RTP-MIDI host", nLength);
+	bool res = m_pAppleMIDIParticipant->SendMIDIToHost(pMessage, nLength);
+        if (!res) {
+            LOGERR("Failed to send %u bytes to RTP-MIDI host", (unsigned long) nLength);
 	} else {
-//		LOGDBG("Sent %u bytes to RTP-MIDI host", nLength);
+//		LOGDBG("Sent %u bytes to RTP-MIDI host", (unsigned long) nLength);
 	}
     }
 
     if (m_pUDPSendSocket) {
         int res = m_pUDPSendSocket->SendTo(pMessage, nLength, 0, m_UDPDestAddress, m_UDPDestPort);
         if (res < 0) {
-            LOGERR("Failed to send %u bytes to UDP MIDI host", nLength);
+            LOGERR("Failed to send %u bytes to UDP MIDI host", (unsigned long) nLength);
         } else {
-//            LOGDBG("Sent %u bytes to UDP MIDI host (broadcast)", nLength);
+//            LOGDBG("Sent %u bytes to UDP MIDI host", (unsigned long) nLength);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,8 @@ void CConfig::Load (void)`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`- m_bMIDIThruBlockSpam = m_Properties.GetNumber ("MIDIThruBlockSpam", 0) != 0;`
	`126`	`+ m_bMIDIThruIgnoreClock = m_Properties.GetNumber ("MIDIThruIgnoreClock", 0) != 0;`
	`127`	`+ m_bMIDIThruIgnoreActiveSensing = m_Properties.GetNumber ("MIDIThruIgnoreActiveSensing", 0) != 0;`
`127`	`128`
`128`	`129`	`m_bMIDIRXProgramChange = m_Properties.GetNumber ("MIDIRXProgramChange", 1) != 0;`
`129`	`130`	`m_bIgnoreAllNotesOff = m_Properties.GetNumber ("IgnoreAllNotesOff", 0) != 0;`
`@@ -235,8 +236,8 @@ void CConfig::Load (void)`
`235`	`236`	`if (const u8 *pIP = m_Properties.GetIPAddress("NetworkDNSServer")) m_INetworkDNSServer.Set (pIP);`
`236`	`237`	`m_bNetworkFTPEnabled = m_Properties.GetNumber("NetworkFTPEnabled", 0) != 0;`
`237`	`238`	`if (const u8 *pIP = m_Properties.GetIPAddress ("NetworkSyslogServerIPAddress")) m_INetworkSyslogServerIPAddress.Set (pIP);`
`238`		`- m_bUdpMidiEnabled = m_Properties.GetNumber("UdpMidiEnabled", 0) != 0;`
`239`		`- if (const u8 *pIP = m_Properties.GetIPAddress("UdpMidiIPAddress")) m_IUdpMidiIPAddress.Set (pIP);`
	`239`	`+ m_bUDPMIDIEnabled = m_Properties.GetNumber("UDPMIDIEnabled", 0) != 0;`
	`240`	`+ if (const u8 *pIP = m_Properties.GetIPAddress("UDPMIDIIPAddress")) m_IUDPMIDIIPAddress.Set (pIP);`
`240`	`241`
`241`	`242`	`m_nMasterVolume = m_Properties.GetNumber ("MasterVolume", 64);`
`242`	`243`	`}`
`@@ -363,9 +364,14 @@ const char *CConfig::GetMIDIThru2Out (void) const`
`363`	`364`	`return m_MIDIThru2Out.c_str ();`
`364`	`365`	`}`
`365`	`366`
`366`		`-bool CConfig::GetMIDIThruBlockSpam (void) const`
	`367`	`+bool CConfig::GetMIDIThruIgnoreClock (void) const`
`367`	`368`	`{`
`368`		`- return m_bMIDIThruBlockSpam;`
	`369`	`+ return m_bMIDIThruIgnoreClock;`
	`370`	`+}`
	`371`	`+`
	`372`	`+bool CConfig::GetMIDIThruIgnoreActiveSensing (void) const`
	`373`	`+{`
	`374`	`+ return m_bMIDIThruIgnoreActiveSensing;`
`369`	`375`	`}`
`370`	`376`
`371`	`377`	`bool CConfig::GetMIDIRXProgramChange (void) const`
`@@ -833,12 +839,12 @@ bool CConfig::GetNetworkFTPEnabled (void) const`
`833`	`839`	`return m_bNetworkFTPEnabled;`
`834`	`840`	`}`
`835`	`841`
`836`		`-bool CConfig::GetUdpMidiEnabled (void) const`
	`842`	`+bool CConfig::GetUDPMIDIEnabled (void) const`
`837`	`843`	`{`
`838`		`- return m_bUdpMidiEnabled;`
	`844`	`+ return m_bUDPMIDIEnabled;`
`839`	`845`	`}`
`840`	`846`
`841`		`-const CIPAddress& CConfig::GetUdpMidiIPAddress (void) const`
	`847`	`+const CIPAddress& CConfig::GetUDPMIDIIPAddress (void) const`
`842`	`848`	`{`
`843`		`- return m_IUdpMidiIPAddress;`
	`849`	`+ return m_IUDPMIDIIPAddress;`
`844`	`850`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ boolean CUDPMIDIDevice::Initialize (void)`
`58`	`58`	`else`
`59`	`59`	`LOGNOTE("RTP Listener initialized");`
`60`	`60`
`61`		`- if (m_pConfig->GetUdpMidiEnabled())`
	`61`	`+ if (m_pConfig->GetUDPMIDIEnabled())`
`62`	`62`	`{`
`63`	`63`	`m_pUDPMIDIReceiver = new CUDPMIDIReceiver(this);`
`64`	`64`	`if (!m_pUDPMIDIReceiver->Initialize())`
`@@ -73,9 +73,9 @@ boolean CUDPMIDIDevice::Initialize (void)`
`73`	`73`	`// UDP MIDI send socket setup (default: broadcast 255.255.255.255:1999)`
`74`	`74`	`m_UDPDestAddress.Set(0xFFFFFFFF); // Broadcast by default`
`75`	`75`	`m_UDPDestPort = 1999;`
`76`		`- if (m_pConfig->GetUdpMidiIPAddress().IsSet())`
	`76`	`+ if (m_pConfig->GetUDPMIDIIPAddress().IsSet())`
`77`	`77`	`{`
`78`		`- m_UDPDestAddress.Set( m_pConfig->GetUdpMidiIPAddress() );`
	`78`	`+ m_UDPDestAddress.Set( m_pConfig->GetUDPMIDIIPAddress() );`
`79`	`79`	`}`
`80`	`80`	`CString IPAddressString;`
`81`	`81`	`m_UDPDestAddress.Format(&IPAddressString);`
`@@ -127,20 +127,20 @@ void CUDPMIDIDevice::OnUDPMIDIDataReceived(const u8* pData, size_t nSize)`
`127`	`127`	`void CUDPMIDIDevice::Send(const u8 *pMessage, size_t nLength, unsigned nCable)`
`128`	`128`	`{`
`129`	`129`	`if (m_pAppleMIDIParticipant) {`
`130`		`- int res = m_pAppleMIDIParticipant->SendMIDIToHost(pMessage, nLength);`
`131`		`- if (res < 0) {`
`132`		`- LOGERR("Failed to send %u bytes to RTP-MIDI host", nLength);`
	`130`	`+ bool res = m_pAppleMIDIParticipant->SendMIDIToHost(pMessage, nLength);`
	`131`	`+ if (!res) {`
	`132`	`+ LOGERR("Failed to send %u bytes to RTP-MIDI host", (unsigned long) nLength);`
`133`	`133`	`} else {`
`134`		`-// LOGDBG("Sent %u bytes to RTP-MIDI host", nLength);`
	`134`	`+// LOGDBG("Sent %u bytes to RTP-MIDI host", (unsigned long) nLength);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`if (m_pUDPSendSocket) {`
`139`	`139`	`int res = m_pUDPSendSocket->SendTo(pMessage, nLength, 0, m_UDPDestAddress, m_UDPDestPort);`
`140`	`140`	`if (res < 0) {`
`141`		`- LOGERR("Failed to send %u bytes to UDP MIDI host", nLength);`
	`141`	`+ LOGERR("Failed to send %u bytes to UDP MIDI host", (unsigned long) nLength);`
`142`	`142`	`} else {`
`143`		`-// LOGDBG("Sent %u bytes to UDP MIDI host (broadcast)", nLength);`
	`143`	`+// LOGDBG("Sent %u bytes to UDP MIDI host", (unsigned long) nLength);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`