added ssrc to ReceiveMidi calls (private functions)

src/AppleMIDI.h

@@ -289,9 +289,9 @@ class AppleMIDISession
 
 	// rtpMIDI callback from parser
     void ReceivedRtp(const Rtp_t &);
-    void StartReceivedMidi();
-    void ReceivedMidi(byte data);
-    void EndReceivedMidi();
+    void StartReceivedMidi(const ssrc_t&);
+    void ReceivedMidi(const ssrc_t&, byte data);
+    void EndReceivedMidi(const ssrc_t&);
 
 	// Helpers
     void writeInvitation      (UdpClass &, const IPAddress &, const uint16_t &, AppleMIDI_Invitation_t &, const byte *command);

src/AppleMIDI.hpp

@@ -1035,31 +1035,31 @@ void AppleMIDISession<UdpClass, Settings, Platform>::ReceivedRtp(const Rtp_t& rt
 }
 
 template <class UdpClass, class Settings, class Platform>
-void AppleMIDISession<UdpClass, Settings, Platform>::StartReceivedMidi()
+void AppleMIDISession<UdpClass, Settings, Platform>::StartReceivedMidi(const ssrc_t& ssrc)
 {
 #ifdef USE_EXT_CALLBACKS
    if (nullptr != _startReceivedMidiByteCallback)
-        _startReceivedMidiByteCallback(0);
+        _startReceivedMidiByteCallback(ssrc);
 #endif
 }
 
 template <class UdpClass, class Settings, class Platform>
-void AppleMIDISession<UdpClass, Settings, Platform>::ReceivedMidi(byte value)
+void AppleMIDISession<UdpClass, Settings, Platform>::ReceivedMidi(const ssrc_t& ssrc, byte value)
 {
 #ifdef USE_EXT_CALLBACKS
     if (nullptr != _receivedMidiByteCallback)
-        _receivedMidiByteCallback(0, value);
+        _receivedMidiByteCallback(ssrc, value);
 #endif
 
     inMidiBuffer.push_back(value);
 }
 
 template <class UdpClass, class Settings, class Platform>
-void AppleMIDISession<UdpClass, Settings, Platform>::EndReceivedMidi()
+void AppleMIDISession<UdpClass, Settings, Platform>::EndReceivedMidi(const ssrc_t& ssrc)
 {
 #ifdef USE_EXT_CALLBACKS
     if (nullptr != _endReceivedMidiByteCallback)
-        _endReceivedMidiByteCallback(0);
+        _endReceivedMidiByteCallback(ssrc);
 #endif
 }
 

src/rtpMIDI_Parser_MidiCommandSection.hpp

@@ -77,9 +77,9 @@ size_t decodeMidi(RtpBuffer_t &buffer, uint8_t &runningstatus)
      * not be intermingled with other MIDI-commands, so we handle this case right here and return */
     if (octet >= 0xf8)
     {
-        session->StartReceivedMidi();
-        session->ReceivedMidi(buffer[0]);
-        session->EndReceivedMidi();
+        session->StartReceivedMidi(session->getSynchronizationSource());
+        session->ReceivedMidi(session->getSynchronizationSource(), buffer[0]);
+        session->EndReceivedMidi(session->getSynchronizationSource());
 
         return 1;
     }
@@ -145,10 +145,10 @@ size_t decodeMidi(RtpBuffer_t &buffer, uint8_t &runningstatus)
             break;
         }
 
-        session->StartReceivedMidi();
+        session->StartReceivedMidi(session->getSynchronizationSource());
         for (size_t j = 0; j < consumed; j++)
-            session->ReceivedMidi(buffer[j]);
-        session->EndReceivedMidi();
+            session->ReceivedMidi(session->getSynchronizationSource(), buffer[j]);
+        session->EndReceivedMidi(session->getSynchronizationSource());
 
         return consumed;
     }
@@ -175,10 +175,10 @@ size_t decodeMidi(RtpBuffer_t &buffer, uint8_t &runningstatus)
         break;
     }
 
-    session->StartReceivedMidi();
+    session->StartReceivedMidi(session->getSynchronizationSource());
     for (size_t j = 0; j < consumed; j++)
-        session->ReceivedMidi(buffer[j]);
-    session->EndReceivedMidi();
+        session->ReceivedMidi(session->getSynchronizationSource(), buffer[j]);
+    session->EndReceivedMidi(session->getSynchronizationSource());
 
     return consumed;
 }
@@ -208,11 +208,11 @@ size_t decodeMidiSysEx(RtpBuffer_t &buffer)
     consumed--;
 
     // send MIDI data
-    session->StartReceivedMidi();
+    session->StartReceivedMidi(session->getSynchronizationSource());
     for (size_t j = 0; j < consumed; j++)
-        session->ReceivedMidi(buffer[j]);
-    session->ReceivedMidi(MIDI_NAMESPACE::MidiType::SystemExclusiveStart);
-    session->EndReceivedMidi();
+        session->ReceivedMidi(session->getSynchronizationSource(), buffer[j]);
+    session->ReceivedMidi(session->getSynchronizationSource(), MIDI_NAMESPACE::MidiType::SystemExclusiveStart);
+    session->EndReceivedMidi(session->getSynchronizationSource());
 
     // Remove the bytes that were submitted
     for (size_t j = 0; j < consumed; j++)