Merge branch 'harp-timestamps' into recording-optimization-anjal

Author: jsiegle

Source/Processors/FileReader/FileReader.cpp

@@ -788,7 +788,7 @@ void FileReader::addEventsInRange (int64 start, int64 stop)
             uint8 ttlBit = events.channels[i];
             bool state = events.channelStates[i] > 0;
             TTLEventPtr event = TTLEvent::createTTLEvent (eventChannels[0], events.sampleNumbers[i], ttlBit, state);
-            addEvent (event, int (absoluteCurrentSampleNumber));
+            addEvent (event, int (absoluteCurrentSampleNumber - start));
         }
     }
 }

Source/Processors/Parameter/ParameterEditor.cpp

@@ -909,14 +909,30 @@ void SyncControlButton::paintButton (Graphics& g, bool isMouseOver, bool isButto
             }
             break;
         }
+        case SyncStatus::HARP_CLOCK:
+        {
+            Colour harpClockColour = Colour (200, 150, 255); // Light purplse
+
+            if (isMouseOver)
+            {
+                g.setColour (harpClockColour);
+            }
+            else
+            {
+                g.setColour (harpClockColour.darker (0.5f));
+            }
+            break;
+        }
     }
 
     g.fillRoundedRectangle (2, 2, getWidth() - 4, getHeight() - 4, 3);
 
+    // Draw text indicators
+    g.setColour (Colour (255, 255, 255));
+    g.setFont (FontOptions ("Inter", "Regular", 12.0f));
+    
     if (node->isMainDataStream (streamKey))
     {
-        g.setColour (Colour (255, 255, 255));
-        g.setFont (FontOptions ("Inter", "Regular", 12.0f));
         g.drawText ("M", getLocalBounds().reduced (3), juce::Justification::centred);
     }
 }

Source/Processors/ProcessorGraph/ProcessorGraph.cpp

@@ -1371,16 +1371,17 @@ void ProcessorGraph::updateConnections()
             sourceMap[node].add (conn);
         }
 
-        // Finally, actually connect sources to each dest processor,
-        // in correct order by merger topography
-        for (const auto& destSources : sourceMap)
-        {
-            GenericProcessor* dest = destSources.first;
+    }
 
-            for (const ConnectionInfo& conn : destSources.second)
-            {
-                connectProcessors (conn.source, dest, conn.connectContinuous, conn.connectEvents);
-            }
+    // Finally, actually connect sources to each dest processor,
+    // in correct order by merger topography
+    for (const auto& destSources : sourceMap)
+    {
+        GenericProcessor* dest = destSources.first;
+
+        for (const ConnectionInfo& conn : destSources.second)
+        {
+            connectProcessors (conn.source, dest, conn.connectContinuous, conn.connectEvents);
         }
     }
 }

Source/Processors/RecordNode/RecordNode.cpp

@@ -717,7 +717,7 @@ bool RecordNode::isSynchronized()
     {
         SyncStatus status = synchronizer.getStatus (stream->getKey());
 
-        if (status != SYNCED && status != HARDWARE_SYNCED)
+        if (status != SYNCED && status != HARDWARE_SYNCED && status != HARP_CLOCK)
             return false;
     }