Fixes for SYSEX handling.

src/mididevice.cpp

@@ -82,22 +82,6 @@ u8 CMIDIDevice::GetChannel (unsigned nTG) const
 	return m_ChannelMap[nTG];
 }
 
-int8_t CMIDIDevice::SearchChannel (uint8_t uMidiChannel) const
-{
-  uint8_t nTG;
-  int8_t nResult=-1;
-  for (nTG = 0; nTG < CConfig::ToneGenerators; nTG++)
-  {     
-    if (m_ChannelMap[nTG] == uMidiChannel)
-    {
-      nResult=nTG;
-      break;
-    }
-  }
-
-  return(nResult);
-}
-
 void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsigned nCable)
 {
 	// The packet contents are just normal MIDI data - see
@@ -125,6 +109,23 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign
 				(unsigned) pMessage[0], (unsigned) pMessage[1],
 				(unsigned) pMessage[2]);
 			break;
+		default:
+			switch(pMessage[0])
+			{
+				case MIDI_SYSTEM_EXCLUSIVE:
+					printf("SysEx data length: [%d]\n",uint16_t(nLength));
+					printf("SysEx data:\n");
+					for (uint16_t i = 0; i < nLength; i++)
+					{
+						if((i % 8) == 0)
+							printf("%04d: ",i);
+						printf("0x%02x",pMessage[i]);
+						if((i % 8) == 0)
+							printf("\n");
+					}
+					break;
+			}
+
 		}
 	}
 
@@ -149,11 +150,21 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign
 	u8 ucChannel = ucStatus & 0x0F;
 	u8 ucType    = ucStatus >> 4;
 
-	if(ucStatus == MIDI_SYSTEM_EXCLUSIVE) // No MIDI channel information in SYSEX
-		HandleSystemExclusive(pMessage, nLength, ucChannel);
+	// GLOBAL MIDI SYSEX
+	if (pMessage[0] == MIDI_SYSTEM_EXCLUSIVE && pMessage[3] == 0x04 &&  pMessage[4] == 0x01 && pMessage[nLength-1] == 0xF7) // MASTER VOLUME
+	{
+		float32_t nMasterVolume=(pMessage[5] & (pMessage[6]<<7))/(1<<14);
+		LOGNOTE("Master volume: %f",nMasterVolume);
+		; // Handle global master volume
+	}
 	else
 	{
 		for (unsigned nTG = 0; nTG < CConfig::ToneGenerators; nTG++)
+		{
+			// MIDI SYSEX per MIDI channel
+			if (ucStatus == MIDI_SYSTEM_EXCLUSIVE && m_ChannelMap[nTG] == pMessage[2] & 0x07)
+				HandleSystemExclusive(pMessage, nLength, nTG);
+			else
 			{
 				if (   m_ChannelMap[nTG] == ucChannel
 				    || m_ChannelMap[nTG] == OmniMode)
@@ -278,6 +289,7 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign
 			}
 		}
 	}
+}
 
 void CMIDIDevice::AddDevice (const char *pDeviceName)
 {
@@ -290,22 +302,9 @@ void CMIDIDevice::AddDevice (const char *pDeviceName)
 	s_DeviceMap.insert (std::pair<std::string, CMIDIDevice *> (pDeviceName, this));
 }
 
-void CMIDIDevice::HandleSystemExclusive(const uint8_t* pMessage, const size_t nLength, const uint8_t nMidiChannel)
+void CMIDIDevice::HandleSystemExclusive(const uint8_t* pMessage, const size_t nLength, const uint8_t nTG)
 {
   int16_t sysex_return;
-  int8_t nTG;
-
-  if ((pMessage[2] & 0x0f) != nMidiChannel) // for Yamaha: SysEx channel checking inside message
-    return;
-
-  nTG = SearchChannel(nMidiChannel);
-  if(nTG < 0)
-    return;
-
-  LOGDBG("SysEx data length: [%d]",nLength);
-  LOGDBG("SysEx data:");
-  for (uint16_t i = 0; i < nLength; i++)
-    LOGDBG("%04d : [0x%02h",i,pMessage[i]);
 
   sysex_return = m_pSynthesizer->checkSystemExclusive(pMessage, nLength, nTG);
   LOGDBG("SYSEX handler return value: %d", sysex_return);

src/mididevice.h

@@ -47,7 +47,6 @@ public:
 
 	void SetChannel (u8 ucChannel, unsigned nTG);
 	u8 GetChannel (unsigned nTG) const;
-	int8_t SearchChannel (uint8_t uMidiChannel) const;
 
 	virtual void Send (const u8 *pMessage, size_t nLength, unsigned nCable = 0) {}
 
@@ -56,7 +55,7 @@ protected:
 
 	void AddDevice (const char *pDeviceName);
 
-	void HandleSystemExclusive(const uint8_t* pMessage, const size_t nLength, const uint8_t nMidiChannel);
+	void HandleSystemExclusive(const uint8_t* pMessage, const size_t nLength, const uint8_t nTG);
 
 private:
 	CMiniDexed *m_pSynthesizer;