From 7b736feb2a3ec672291f2b062338af66ea6db38f Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Wed, 9 May 2018 09:56:48 +0100
Subject: [PATCH] Added an optional thread name parameter to the OSCReceiver
 constructor

---
 modules/juce_osc/osc/juce_OSCReceiver.cpp | 27 +++++++++++++----------
 modules/juce_osc/osc/juce_OSCReceiver.h   |  5 ++++-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/modules/juce_osc/osc/juce_OSCReceiver.cpp b/modules/juce_osc/osc/juce_OSCReceiver.cpp
index d197f7b75d..c52ae4805d 100644
--- a/modules/juce_osc/osc/juce_OSCReceiver.cpp
+++ b/modules/juce_osc/osc/juce_OSCReceiver.cpp
@@ -101,9 +101,9 @@ namespace
             if (input.getNumBytesRemaining() < 4)
                 throw OSCFormatError ("OSC input stream exhausted while reading string");
 
-            const size_t posBegin = (size_t) getPosition();
-            String s (input.readString());
-            const size_t posEnd = (size_t) getPosition();
+            auto posBegin = (size_t) getPosition();
+            auto s = input.readString();
+            auto posEnd = (size_t) getPosition();
 
             if (static_cast<const char*> (getData()) [posEnd - 1] != '\0')
                 throw OSCFormatError ("OSC input stream exhausted before finding null terminator of string");
@@ -119,14 +119,14 @@ namespace
             if (input.getNumBytesRemaining() < 4)
                 throw OSCFormatError ("OSC input stream exhausted while reading blob");
 
-            const size_t blobDataSize = (size_t) input.readIntBigEndian();
+            auto blobDataSize = (size_t) input.readIntBigEndian();
 
             if ((size_t) input.getNumBytesRemaining() < (blobDataSize + 3) % 4)
                 throw OSCFormatError ("OSC input stream exhausted before reaching end of blob");
 
             MemoryBlock blob;
 
-            const size_t bytesRead = input.readIntoMemoryBlock (blob, (ssize_t) blobDataSize);
+            auto bytesRead = input.readIntoMemoryBlock (blob, (ssize_t) blobDataSize);
             readPaddingZeros (bytesRead);
 
             return blob;
@@ -203,8 +203,8 @@ namespace
         //==============================================================================
         OSCMessage readMessage()
         {
-            OSCAddressPattern ap = readAddressPattern();
-            OSCTypeList types = readTypeTagString();
+            auto ap = readAddressPattern();
+            auto types = readTypeTagString();
 
             OSCMessage msg (ap);
 
@@ -321,7 +321,7 @@ namespace
 struct OSCReceiver::Pimpl   : private Thread,
                               private MessageListener
 {
-    Pimpl()  : Thread ("JUCE OSC server")
+    Pimpl (const String& threadName)  : Thread (threadName)
     {
     }
 
@@ -387,8 +387,7 @@ struct OSCReceiver::Pimpl   : private Thread,
         addListenerWithAddress (listenerToAdd, addressToMatch, listenersWithAddress);
     }
 
-    void addListener (ListenerWithOSCAddress<RealtimeCallback>* listenerToAdd,
-                      OSCAddress addressToMatch)
+    void addListener (ListenerWithOSCAddress<RealtimeCallback>* listenerToAdd, OSCAddress addressToMatch)
     {
         addListenerWithAddress (listenerToAdd, addressToMatch, realtimeListenersWithAddress);
     }
@@ -429,7 +428,7 @@ struct OSCReceiver::Pimpl   : private Thread,
 
         try
         {
-            OSCBundle::Element content = inStream.readElementWithKnownSize (dataSize);
+            auto content = inStream.readElementWithKnownSize (dataSize);
 
             // realtime listeners should receive the OSC content first - and immediately
             // on this thread:
@@ -587,7 +586,11 @@ private:
 };
 
 //==============================================================================
-OSCReceiver::OSCReceiver()   : pimpl (new Pimpl())
+OSCReceiver::OSCReceiver (const String& threadName)   : pimpl (new Pimpl (threadName))
+{
+}
+
+OSCReceiver::OSCReceiver()  : OSCReceiver ("JUCE OSC server")
 {
 }
 
diff --git a/modules/juce_osc/osc/juce_OSCReceiver.h b/modules/juce_osc/osc/juce_OSCReceiver.h
index 1f78122bcd..4aa29ebb0c 100644
--- a/modules/juce_osc/osc/juce_OSCReceiver.h
+++ b/modules/juce_osc/osc/juce_OSCReceiver.h
@@ -42,9 +42,12 @@ class JUCE_API  OSCReceiver
 {
 public:
     //==============================================================================
-    /** Constructs a new OSCReceiver. */
+    /** Creates an OSCReceiver. */
     OSCReceiver();
 
+    /** Creates an OSCReceiver with a specific name for its thread. */
+    OSCReceiver (const String& threadName);
+
     /** Destructor. */
     ~OSCReceiver();