Add initial mdns responder for rtp-midi aka applemidi (#749)

Co-authored-by: Ömer Şiar Baysal <osiarbaysal@gmail.com>

src/minidexed.cpp

@@ -2197,7 +2197,8 @@ void CMiniDexed::UpdateNetwork()
 		CString IPString;
 		m_pNet->GetConfig()->GetIPAddress()->Format(&IPString);
 
-		LOGNOTE("Network up and running at: %s", static_cast<const char *>(IPString));
+		//LOGNOTE("Network up and running at: %s", static_cast<const char *>(IPString));
+		
 
 		m_UDPMIDI.Initialize();
 
@@ -2214,11 +2215,17 @@ void CMiniDexed::UpdateNetwork()
 			LOGNOTE("FTP daemon initialized");
 		}
 
-		m_UI.DisplayWrite ("IP",
+		m_UI.DisplayWrite ("IP", "Network", IPString, 0, 1);
-			      "Network",
+
-			      IPString,
+		CmDNSPublisher *pmDNSPublisher = new CmDNSPublisher (m_pNet);
-			      0,
+		assert (pmDNSPublisher);
-				  1);
+		static const char ServiceName[] = "minidexed-rtpmidi";
+		static const char *ppText[] = {"RTP-MIDI Receiver", nullptr};	// TXT record strings
+		if (!pmDNSPublisher->PublishService (ServiceName, CmDNSPublisher::ServiceTypeAppleMIDI,
+						     5004, ppText))
+		{
+			LOGPANIC ("Cannot publish mdns service");
+		}
 	}
 	else if (m_bNetworkReady && !bNetIsRunning)
 	{

src/minidexed.h

@@ -43,6 +43,7 @@
 #include <circle/net/netsubsystem.h>
 #include <wlan/bcm4343.h>
 #include <wlan/hostap/wpa_supplicant/wpasupplicant.h>
+#include <circle/net/mdnspublisher.h>
 #include <circle/spinlock.h>
 #include "common.h"
 #include "effect_mixer.hpp"

src/rtpmididevice.cpp

@@ -26,24 +26,21 @@
 #include "rtpmididevice.h"
 #include <assert.h>
 
+#define VIRTUALCABLE 24
+
 LOGMODULE("rtpmididevice");
 
 CRTPMIDIDevice::CRTPMIDIDevice (CMiniDexed *pSynthesizer,
 				      CConfig *pConfig, CUserInterface *pUI)
 :	CMIDIDevice (pSynthesizer, pConfig, pUI),
 	m_pConfig (pConfig)
-	
-	//m_Serial (pInterrupt, TRUE),
-	//m_nSerialState (0),
-	//m_nSysEx (0),
-	//m_SendBuffer (&m_Serial)
 {
 	AddDevice ("rtpdummy");
 }
 
 CRTPMIDIDevice::~CRTPMIDIDevice (void)
 {
-	//m_nSerialState = 255;
+
 }
 
 boolean CRTPMIDIDevice::Initialize (void)
@@ -63,10 +60,7 @@ boolean CRTPMIDIDevice::Initialize (void)
 
 void CRTPMIDIDevice::OnAppleMIDIDataReceived(const u8* pData, size_t nSize)
 {
-	LOGNOTE("Recieved RTP MIDI Data");
+	MIDIMessageHandler(pData, nSize, VIRTUALCABLE);
-	printf ("MIDI-RTP: %02X %02X\n",
-				(unsigned) pData[0], (unsigned) pData[1]);
-	MIDIMessageHandler(pData, nSize);
 }
 
 void CRTPMIDIDevice::OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName)

src/rtpmididevice.h

@@ -27,11 +27,6 @@
 #include "config.h"
 #include "net/applemidi.h"
 
-#include <circle/interrupt.h>
-#include <circle/serial.h>
-#include <circle/writebuffer.h>
-#include <circle/types.h>
-
 class CMiniDexed;
 
 class CRTPMIDIDevice : CAppleMIDIHandler, CMIDIDevice
@@ -44,26 +39,11 @@ public:
 	virtual void OnAppleMIDIDataReceived(const u8* pData, size_t nSize) override;
 	virtual void OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName) override;
 	virtual void OnAppleMIDIDisconnect(const CIPAddress* pIPAddress, const char* pName) override;
-    //void OnAppleMIDIDataReceived(const u8* pData, size_t nSize);
-	//void OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName);
-	//void OnAppleMIDIDisconnect(const CIPAddress* pIPAddress, const char* pName);
-
-	//void Process (void);
-
-	//void Send (const u8 *pMessage, size_t nLength, unsigned nCable = 0) override;
 
 private:
 	CConfig *m_pConfig;
-
-	//CSerialDevice m_Serial;
-	//unsigned m_nSerialState;
-	//unsigned m_nSysEx;
-	//u8 m_SerialMessage[MAX_MIDI_MESSAGE];
-
-	//CWriteBufferDevice m_SendBuffer;
     CBcmRandomNumberGenerator m_Random;
-	//CAppleMIDIHandler* m_MIDIHandler;
+	CAppleMIDIParticipant* m_pAppleMIDIParticipant;
-	CAppleMIDIParticipant* m_pAppleMIDIParticipant; // AppleMIDI participant instance
 };
 
 #endif