Add unique String key to DataStream

open-ephys · Oct 5, 2023 · 8320509 · 8320509
1 parent 8079085
commit 8320509
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Source/Processors/GenericProcessor/GenericProcessor.cpp b/Source/Processors/GenericProcessor/GenericProcessor.cpp
@@ -986,9 +986,7 @@ void GenericProcessor::update()
             {
                 Array<String> streamNames;
                 for (auto stream : dataStreams)
-                {
-                    streamNames.add(stream->getName());
-                }
+                    streamNames.add(stream->getKey());
                 SelectedStreamParameter* p = (SelectedStreamParameter*)param;
                 p->setStreamNames(streamNames);
                 parameterValueChanged(p);

diff --git a/Source/Processors/RecordNode/RecordNode.cpp b/Source/Processors/RecordNode/RecordNode.cpp
@@ -138,8 +138,8 @@ void RecordNode::parameterValueChanged(Parameter* p)
 		Array<String> streamNames = ((SelectedStreamParameter*)p)->getStreamNames();
 		for (auto stream : dataStreams)
 		{
-			String key = String(stream->getSourceNodeId()) + " | " + stream->getName();
-			if (key == streamNames[((CategoricalParameter*)p)->getSelectedIndex()])
+			String key = stream->getKey();
+			if (key == streamNames[((SelectedStreamParameter*)p)->getSelectedIndex()])
 			{
 				synchronizer.setMainDataStream(stream->getStreamId());
 				break;

diff --git a/Source/Processors/Settings/DataStream.h b/Source/Processors/Settings/DataStream.h
@@ -114,6 +114,9 @@ class PLUGIN_API DataStream :
 	/** Returns the unique ID for this stream*/
 	uint16 getStreamId() const;
 
+	/** Returns a unique String for this stream */
+	String getKey() const { return String(getSourceNodeId()) + "|" + getName(); }
+
 	/** Returns true if this DataStream has a device associated with it.*/
 	bool hasDevice() const;