Update RecordNode to manage sync line and main stream relationships

Author: anjaldoshi

Source/Processors/RecordNode/RecordNode.cpp

@@ -161,20 +161,62 @@ void RecordNode::parameterValueChanged (Parameter* p)
     else if (p->getName() == "sync_line")
     {
         LOGD ("Parameter changed: sync_line");
-        synchronizer.setSyncLine (getDataStream (p->getStreamId())->getKey(), ((TtlLineParameter*) p)->getSelectedLine());
+        int selectedLine = ((TtlLineParameter*) p)->getSelectedLine();
+        synchronizer.setSyncLine (getDataStream (p->getStreamId())->getKey(), selectedLine);
+
+        if (selectedLine == -1 && synchronizer.mainStreamKey == getDataStream (p->getStreamId())->getKey())
+        {
+            int streamIndex = 0;
+            for (auto stream : dataStreams)
+            {
+                if (stream->getStreamId() != p->getStreamId()
+                    && ! synchronizer.streamGeneratesTimestamps (stream->getKey()))
+                {
+                    getParameter ("main_sync")->setNextValue (streamIndex, false);
+                    return;
+                }
+                streamIndex++;
+            }
+
+            getParameter ("main_sync")->setNextValue (-1, false);
+        }
+        else if (selectedLine >= 0 && synchronizer.mainStreamKey.isEmpty())
+        {
+            // If the sync line is set, but no main stream is set, we need to set the main stream to the one with the sync line
+            int streamIndex = 0;
+            for (auto stream : dataStreams)
+            {
+                if (stream->getKey() == getDataStream (p->getStreamId())->getKey())
+                {
+                    getParameter ("main_sync")->setNextValue (streamIndex, false);
+                    return;
+                }
+                streamIndex++;
+            }
+        }
     }
     else if (p->getName() == "main_sync")
     {
         LOGD ("Parameter changed: main_sync");
-        Array<String> streamNames = ((SelectedStreamParameter*) p)->getStreamNames();
-        for (auto stream : dataStreams)
+        int streamIndex = ((SelectedStreamParameter*) p)->getSelectedIndex();
+
+        if (streamIndex == -1)
+        {
+            synchronizer.setMainDataStream ("");
+            return;
+        }
+        else
         {
-            String key = stream->getKey();
-            if (key == streamNames[((SelectedStreamParameter*) p)->getSelectedIndex()]
-                && ! synchronizer.streamGeneratesTimestamps (key))
+            Array<String> streamNames = ((SelectedStreamParameter*) p)->getStreamNames();
+            for (auto stream : dataStreams)
             {
-                synchronizer.setMainDataStream (stream->getKey());
-                break;
+                String key = stream->getKey();
+                if (key == streamNames[streamIndex]
+                    && ! synchronizer.streamGeneratesTimestamps (key))
+                {
+                    synchronizer.setMainDataStream (stream->getKey());
+                    break;
+                }
             }
         }
     }
@@ -549,11 +591,13 @@ void RecordNode::updateSettings()
 
     for (auto stream : dataStreams)
     {
+        TtlLineParameter* syncLineParam = static_cast<TtlLineParameter*> (stream->getParameter ("sync_line"));
         const uint16 streamId = stream->getStreamId();
         activeStreamIds.add (streamId);
 
         LOGD ("Record Node found stream: (", streamId, ") ", stream->getName(), " with sample rate ", stream->getSampleRate());
-        synchronizer.addDataStream (stream->getKey(), stream->getSampleRate(), stream->generatesTimestamps());
+        int syncLine = syncLineParam->getSelectedLine();
+        synchronizer.addDataStream (stream->getKey(), stream->getSampleRate(), syncLine, stream->generatesTimestamps());
 
         fifoUsage[streamId] = 0.0f;
 
@@ -567,7 +611,6 @@ void RecordNode::updateSettings()
             numLines = 1;
 
         // Update the number of available lines in the sync line parameter
-        TtlLineParameter* syncLineParam = static_cast<TtlLineParameter*> (stream->getParameter ("sync_line"));
         syncLineParam->setMaxAvailableLines (numLines);
     }
 

Source/Processors/Synchronizer/Synchronizer.cpp

@@ -375,9 +375,11 @@ void Synchronizer::finishedUpdate()
             }
         }
     }
+    
+    reset();
 }
 
-void Synchronizer::addDataStream (String streamKey, float expectedSampleRate, bool generatesTimestamps)
+void Synchronizer::addDataStream (String streamKey, float expectedSampleRate, int syncLine, bool generatesTimestamps)
 {
     LOGD ("Synchronizer adding ", streamKey, " with sample rate ", expectedSampleRate);
 
@@ -391,14 +393,14 @@ void Synchronizer::addDataStream (String streamKey, float expectedSampleRate, bo
     //std::cout << "Creating new Stream object" << std::endl;
     dataStreamObjects.add (new SyncStream (streamKey, expectedSampleRate, this, generatesTimestamps));
     streams[streamKey] = dataStreamObjects.getLast();
-    setSyncLine (streamKey, generatesTimestamps ? -1 : 0); // if the stream generates its own timestamps, set sync line to -1 (no sync line), otherwise set it to 0
+    streams[streamKey]->syncLine = syncLine;
 
     streamCount++;
 }
 
 void Synchronizer::setMainDataStream (String streamKey)
 {
-    if (streams.count (streamKey) == 0)
+    if (streamKey.isNotEmpty() && streams.count (streamKey) == 0)
     {
         LOGD ("Cannot set ", streamKey, " as main data stream. Stream not found.");
         return;

Source/Processors/Synchronizer/Synchronizer.h

@@ -224,9 +224,8 @@ class PLUGIN_API Synchronizer : public HighResolutionTimer
     /** Sets main stream ID to 0 and stream count to 0*/
     void prepareForUpdate();
 
-    /** Adds a new data stream with an expected sample rate
-     *  If the stream already exists, */
-    void addDataStream (String streamKey, float expectedSampleRate, bool generatesTimestamps = false);
+    /** Adds a new data stream with an expected sample rate, a synchronization line, and a flag indicating whether it generates its own timestamps */
+    void addDataStream (String streamKey, float expectedSampleRate, int synLine = 0, bool generatesTimestamps = false);
 
     /** Checks if there is only one stream */
     void finishedUpdate();