Make StringTS private nested class

Author: ethanbb

Source/Plugins/NetworkEvents/NetworkEvents.cpp

@@ -35,67 +35,6 @@ const int MAX_MESSAGE_LENGTH = 64000;
     #include <unistd.h>
 #endif
 
-
-StringTS::StringTS()
-    : timestamp(0)
-{}
-
-
-StringTS::StringTS(String S, int64 ts_software)
-    : str(S)
-    , timestamp(ts_software)
-{}
-
-
-StringTS::StringTS(MidiMessage& event)
-    : timestamp(EventBase::getTimestamp(event))
-{
-    if (Event::getEventType(event) != EventChannel::EventChannelTypes::TEXT)
-    {
-        return; // only handles text events
-    }
-
-    const uint8* dataptr = event.getRawData();
-    // relying on null terminator to get end of string...
-    str = String::fromUTF8(reinterpret_cast<const char*>(dataptr + EVENT_BASE_SIZE));
-}
-
-
-std::vector<String> StringTS::splitString (char sep) const
-{
-    String curr;
-
-    std::list<String> ls;
-    for (int k = 0; k < str.length(); ++k)
-    {
-        if (str[k] != sep)
-        {
-            curr+=str[k];
-        }
-        else
-        {
-            ls.push_back (curr);
-            while (str[k] == sep && k < str.length())
-                ++k;
-
-            curr = "";
-            if (str[k] != sep && k < str.length())
-                curr += str[k];
-        }
-    }
-    if (str.length() > 0)
-    {
-        if (str[str.length() - 1] != sep)
-            ls.push_back (curr);
-    }
-
-    std::vector<String> Svec (ls.begin(), ls.end());
-    return Svec;
-}
-
-
-/*********************************************/
-
 NetworkEvents::NetworkEvents()
     : GenericProcessor  ("Network Events")
     , Thread            ("NetworkThread")
@@ -648,6 +587,66 @@ void NetworkEvents::updatePort(uint16 port)
 }
 
 
+/*** StringTS ***/
+
+NetworkEvents::StringTS::StringTS()
+    : timestamp(0)
+{}
+
+
+NetworkEvents::StringTS::StringTS(String S, int64 ts_software)
+    : str(S)
+    , timestamp(ts_software)
+{}
+
+
+NetworkEvents::StringTS::StringTS(MidiMessage& event)
+    : timestamp(EventBase::getTimestamp(event))
+{
+    if (Event::getEventType(event) != EventChannel::EventChannelTypes::TEXT)
+    {
+        return; // only handles text events
+    }
+
+    const uint8* dataptr = event.getRawData();
+    // relying on null terminator to get end of string...
+    str = String::fromUTF8(reinterpret_cast<const char*>(dataptr + EVENT_BASE_SIZE));
+}
+
+
+std::vector<String> NetworkEvents::StringTS::splitString(char sep) const
+{
+    String curr;
+
+    std::list<String> ls;
+    for (int k = 0; k < str.length(); ++k)
+    {
+        if (str[k] != sep)
+        {
+            curr += str[k];
+        }
+        else
+        {
+            ls.push_back(curr);
+            while (str[k] == sep && k < str.length())
+                ++k;
+
+            curr = "";
+            if (str[k] != sep && k < str.length())
+                curr += str[k];
+        }
+    }
+    if (str.length() > 0)
+    {
+        if (str[str.length() - 1] != sep)
+            ls.push_back(curr);
+    }
+
+    std::vector<String> Svec(ls.begin(), ls.end());
+    return Svec;
+}
+
+
 /*** Responder ***/
 
 NetworkEvents::Responder::Responder(void* context, uint16 port, uint16 backupPort)

Source/Plugins/NetworkEvents/NetworkEvents.h

@@ -37,22 +37,10 @@
 
 #include <ProcessorHeaders.h>
 
+#include <vector>
 #include <list>
 #include <queue>
 
-class StringTS
-{
-public:
-	StringTS();
-    StringTS(String S, int64 ts_software = CoreServices::getGlobalTimestamp());
-    StringTS(MidiMessage& event);
-
-	std::vector<String> splitString(char sep) const;
-
-	String str;
-	juce::int64 timestamp;
-};
-
 
 /**
  Sends incoming TCP/IP messages from 0MQ to the events buffer
@@ -108,6 +96,20 @@ class NetworkEvents : public GenericProcessor
     uint16 urlport;
 
 private:
+    // combines a string and a timestamp
+    class StringTS
+    {
+    public:
+        StringTS();
+        StringTS(String S, int64 ts_software = CoreServices::getGlobalTimestamp());
+        StringTS(MidiMessage& event);
+
+        std::vector<String> splitString(char sep) const;
+
+        String str;
+        juce::int64 timestamp;
+    };
+
     void createZmqContext();
 
     void postTimestamppedStringToMidiBuffer(StringTS s);