added public setPort method, to be called *before* MIDI.begin

and renamed AM_DBG* => DBG*

Author: lathoub

src/AppleMIDI.h

@@ -59,27 +59,62 @@ class AppleMIDISession
 #endif
     };
 
-    virtual ~AppleMIDISession(){
-    };
+    virtual ~AppleMIDISession(){};
 
-    AppleMIDISession& setHandleConnected(void (*fptr)(const ssrc_t &, const char *)) { _connectedCallback = fptr; return *this; }
-    AppleMIDISession& setHandleDisconnected(void (*fptr)(const ssrc_t &)) { _disconnectedCallback = fptr; return *this; }
+    AppleMIDISession &setHandleConnected(void (*fptr)(const ssrc_t &, const char *))
+    {
+        _connectedCallback = fptr;
+        return *this;
+    }
+    AppleMIDISession &setHandleDisconnected(void (*fptr)(const ssrc_t &))
+    {
+        _disconnectedCallback = fptr;
+        return *this;
+    }
 #ifdef USE_EXT_CALLBACKS
-    void setHandleException(void (*fptr)(const ssrc_t &, const Exception &, const int32_t value))    {        _exceptionCallback = fptr;  return *this; }
-    AppleMIDISession& setHandleReceivedRtp(void (*fptr)(const ssrc_t &, const Rtp_t &, const int32_t &)) { _receivedRtpCallback = fptr;  return *this;}
-    AppleMIDISession& setHandleStartReceivedMidi(void (*fptr)(const ssrc_t &)) { _startReceivedMidiByteCallback = fptr;  return *this;}
-    AppleMIDISession& setHandleReceivedMidi(void (*fptr)(const ssrc_t &, byte)) { _receivedMidiByteCallback = fptr;  return *this;}
-    AppleMIDISession& setHandleEndReceivedMidi(void (*fptr)(const ssrc_t &)) { _endReceivedMidiByteCallback = fptr;  return *this;}
-    AppleMIDISession& setHandleSentRtp(void (*fptr)(const Rtp_t &)) { _sentRtpCallback = fptr;  return *this;}
-    AppleMIDISession& setHandleSentRtpMidi(void (*fptr)(const RtpMIDI_t &)) { _sentRtpMidiCallback = fptr;  return *this;}
+    void setHandleException(void (*fptr)(const ssrc_t &, const Exception &, const int32_t value))
+    {
+        _exceptionCallback = fptr;
+        return *this;
+    }
+    AppleMIDISession &setHandleReceivedRtp(void (*fptr)(const ssrc_t &, const Rtp_t &, const int32_t &))
+    {
+        _receivedRtpCallback = fptr;
+        return *this;
+    }
+    AppleMIDISession &setHandleStartReceivedMidi(void (*fptr)(const ssrc_t &))
+    {
+        _startReceivedMidiByteCallback = fptr;
+        return *this;
+    }
+    AppleMIDISession &setHandleReceivedMidi(void (*fptr)(const ssrc_t &, byte))
+    {
+        _receivedMidiByteCallback = fptr;
+        return *this;
+    }
+    AppleMIDISession &setHandleEndReceivedMidi(void (*fptr)(const ssrc_t &))
+    {
+        _endReceivedMidiByteCallback = fptr;
+        return *this;
+    }
+    AppleMIDISession &setHandleSentRtp(void (*fptr)(const Rtp_t &))
+    {
+        _sentRtpCallback = fptr;
+        return *this;
+    }
+    AppleMIDISession &setHandleSentRtpMidi(void (*fptr)(const RtpMIDI_t &))
+    {
+        _sentRtpMidiCallback = fptr;
+        return *this;
+    }
 #endif
 
 #ifdef KEEP_SESSION_NAME
     const char *getName() const
     {
         return this->localName;
     };
-    AppleMIDISession& setName(const char *sessionName)
+    AppleMIDISession &setName(const char *sessionName)
     {
         strncpy(this->localName, sessionName, DefaultSettings::MaxSessionNameLen);
         return *this;
@@ -89,12 +124,20 @@ class AppleMIDISession
     {
         return nullptr;
     };
-    AppleMIDISession& setName(const char *sessionName){ return *this; };
+    AppleMIDISession &setName(const char *sessionName) { return *this; };
 #endif
+
     const uint16_t getPort() const
     {
         return this->port;
     };
+
+    // call this method *before* calling begin()
+    void setPort(const uint16_t port)
+    {
+        this->port = port;
+    }
+
     const ssrc_t getSynchronizationSource() const { return this->ssrc; };
 
 #ifdef APPLEMIDI_INITIATOR

src/AppleMIDI_Debug.h

@@ -1,36 +1,31 @@
 #pragma once
 
-#include "AppleMIDI_Namespace.h"
-BEGIN_APPLEMIDI_NAMESPACE
-
 #ifdef APPLEMIDI_DEBUG
 namespace {
-static void AM_DBG_SETUP(unsigned long baud) {
+static void DBG_SETUP(unsigned long baud) {
   APPLEMIDI_DEBUG.begin(baud);
   while (!APPLEMIDI_DEBUG);
 }
 
 template <typename T>
-static void AM_DBG_PLAIN(T last) {
+static void DBG_PLAIN(T last) {
   APPLEMIDI_DEBUG.println(last);
 }
 
 template <typename T, typename... Args>
-static void AM_DBG_PLAIN(T head, Args... tail) {
+static void DBG_PLAIN(T head, Args... tail) {
   APPLEMIDI_DEBUG.print(head);
   APPLEMIDI_DEBUG.print(' ');
-  AM_DBG_PLAIN(tail...);
+  DBG_PLAIN(tail...);
 }
 
 template <typename... Args>
-static void AM_DBG(Args... args) {
-  AM_DBG_PLAIN(args...);
+static void DBG(Args... args) {
+  DBG_PLAIN(args...);
 }
 }  // namespace
 #else
-#define AM_DBG_SETUP(...)
-#define AM_DBG_PLAIN(...)
-#define AM_DBG(...)
+#define DBG_SETUP(...)
+#define DBG_PLAIN(...)
+#define DBG(...)
 #endif
-
-END_APPLEMIDI_NAMESPACE