Merge pull request jamulussoftware#677 from softins/sequence-audio

Add sequence numbers to audio packets

Author: corrados

Jamulus.pro

@@ -1,4 +1,4 @@
-VERSION = 3.5.12git
+VERSION = 3.5.12git-softins
 
 # use target name which does not use a captital letter at the beginning
 contains(CONFIG, "noupcasename") {
@@ -46,6 +46,7 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
     CUSTOM_MODES \
     _REENTRANT
 
+
 win32 {
     DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible)
     DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5)

src/buffer.cpp

@@ -52,14 +52,30 @@ bool CNetBuf::Put ( const CVector<uint8_t>& vecbyData,
 {
     bool bPutOK = true;
 
-    // check if there is not enough space available
-    if ( GetAvailSpace() < iInSize )
+    if ( vecbyData[0] == 0xFF )
     {
-        return false;
+        // sequenced packet - 3 bytes header (SEQ_HEADER_SIZE)
+
+        // check if there is not enough space available
+        if ( GetAvailSpace() < iInSize - SEQ_HEADER_SIZE )
+        {
+            return false;
+        }
+
+        // copy new data in internal buffer (implemented in base class)
+        CBufferBase<uint8_t>::PutSeq ( vecbyData, iInSize - SEQ_HEADER_SIZE, iBlockSize );
     }
+    else
+    {
+        // check if there is not enough space available
+        if ( GetAvailSpace() < iInSize )
+        {
+            return false;
+        }
 
-    // copy new data in internal buffer (implemented in base class)
-    CBufferBase<uint8_t>::Put ( vecbyData, iInSize );
+        // copy new data in internal buffer (implemented in base class)
+        CBufferBase<uint8_t>::Put ( vecbyData, iInSize );
+    }
 
     return bPutOK;
 }