Display Harp start time in seconds (instead of ms)

Author: jsiegle

Source/Processors/RecordNode/RecordNode.cpp

@@ -1251,9 +1251,9 @@ void RecordNode::updateSyncMonitors()
 
         RecordNodeEditor* editor = (RecordNodeEditor*) getEditor();
 
-        editor->setStreamStartTime (streamId, synchronizer.isStreamSynced (streamKey), synchronizer.getStartTime (streamKey));
-        editor->setLastSyncEvent (streamId, synchronizer.isStreamSynced (streamKey), synchronizer.getLastSyncEvent (streamKey));
-        editor->setSyncAccuracy (streamId, synchronizer.isStreamSynced (streamKey), synchronizer.getAccuracy (streamKey));
+        editor->setStreamStartTime (streamId, synchronizer.getStatus (streamKey), synchronizer.getStartTime (streamKey));
+        editor->setLastSyncEvent (streamId, synchronizer.getStatus (streamKey), synchronizer.getLastSyncEvent (streamKey));
+        editor->setSyncAccuracy (streamId, synchronizer.getStatus (streamKey), synchronizer.getAccuracy (streamKey));
     }
 }
 

Source/Processors/RecordNode/RecordNodeEditor.cpp

@@ -35,10 +35,20 @@ SyncMonitor::~SyncMonitor()
 {
 }
 
-void SyncMonitor::setSyncMetric (bool isSynchronized_, float syncMetric_)
+void SyncMonitor::setSyncMetric (SyncStatus syncStatus_, float syncMetric_)
 {
-    isSynchronized = isSynchronized_;
+    syncStatus = syncStatus_;
     metric = syncMetric_;
+
+    if(syncStatus == SyncStatus::SYNCED || syncStatus == SyncStatus::HARDWARE_SYNCED || syncStatus == SyncStatus::HARP_CLOCK)
+        isSynchronized = true;
+    else
+        isSynchronized = false;
+
+    if(syncStatus == SyncStatus::HARP_CLOCK)
+        timeUnits = " s";
+    else
+        timeUnits = " ms";
 }
 
 void SyncMonitor::setEnabled (bool state)
@@ -86,7 +96,7 @@ void SyncStartTimeMonitor::paint (Graphics& g)
     if (isSynchronized)
     {
         g.setColour (findColour (ThemeColours::defaultText));
-        g.drawText (String (metric, 2) + " ms", 0, 0, 50, 20, Justification::centred);
+        g.drawText (String (metric, 2) + timeUnits, 0, 0, 50, 20, Justification::centred);
     }
 
     else
@@ -697,30 +707,30 @@ void RecordNodeEditor::buttonClicked (Button* button)
     }
 }
 
-void RecordNodeEditor::setStreamStartTime (uint16 streamId, bool isSynchronized, float offsetMs)
+void RecordNodeEditor::setStreamStartTime (uint16 streamId, SyncStatus status, float offsetMs)
 {
     if (syncStartTimeMonitors.find (streamId) != syncStartTimeMonitors.end())
     {
         if (syncStartTimeMonitors[streamId] != nullptr)
-            syncStartTimeMonitors[streamId]->setSyncMetric (isSynchronized, offsetMs);
+            syncStartTimeMonitors[streamId]->setSyncMetric (status, offsetMs);
     }
 }
 
-void RecordNodeEditor::setLastSyncEvent (uint16 streamId, bool isSynchronized, float syncTimeSeconds)
+void RecordNodeEditor::setLastSyncEvent (uint16 streamId, SyncStatus status, float syncTimeSeconds)
 {
     if (lastSyncEventMonitors.find (streamId) != lastSyncEventMonitors.end())
     {
         if (lastSyncEventMonitors[streamId] != nullptr)
-            lastSyncEventMonitors[streamId]->setSyncMetric (isSynchronized, syncTimeSeconds);
+            lastSyncEventMonitors[streamId]->setSyncMetric (status, syncTimeSeconds);
     }
 }
 
-void RecordNodeEditor::setSyncAccuracy (uint16 streamId, bool isSynchronized, float syncAccuracy)
+void RecordNodeEditor::setSyncAccuracy (uint16 streamId, SyncStatus status, float syncAccuracy)
 {
     if (syncAccuracyMonitors.find (streamId) != syncAccuracyMonitors.end())
     {
         if (syncAccuracyMonitors[streamId] != nullptr)
-            syncAccuracyMonitors[streamId]->setSyncMetric (isSynchronized, syncAccuracy);
+            syncAccuracyMonitors[streamId]->setSyncMetric (status, syncAccuracy);
     }
 }
 

Source/Processors/RecordNode/RecordNodeEditor.h

@@ -27,6 +27,7 @@
 #include "../../Utils/Utils.h"
 #include "../Editors/GenericEditor.h"
 #include "../Editors/PopupChannelSelector.h"
+#include "../Synchronizer/Synchronizer.h"
 
 #include "DiskMonitor/DiskSpaceListener.h"
 
@@ -51,15 +52,17 @@ class SyncMonitor : public Component
     ~SyncMonitor();
 
     /** Sets the most recent sync metric */
-    void setSyncMetric (bool isSynchronized, float syncMetric);
+    void setSyncMetric (SyncStatus syncStatus, float syncMetric);
 
     /** Enable or disable this component*/
     void setEnabled (bool isEnabled);
 
 protected:
     bool isEnabled = true;
-    bool isSynchronized = false;
+    SyncStatus syncStatus = SyncStatus::OFF;
     float metric = 0.0f;
+    bool isSynchronized = false;
+    String timeUnits = " ms";
 };
 
 /** 
@@ -354,13 +357,13 @@ class RecordNodeEditor : public GenericEditor,
     void stopRecording() override {};
 
     /** Set start time for each stream */
-    void setStreamStartTime (uint16 streamId, bool isSynchronized, float offsetMs);
+    void setStreamStartTime (uint16 streamId, SyncStatus status, float offsetMs);
 
     /** Set the time of latest sync pulse */
-    void setLastSyncEvent (uint16 streamId, bool isSynchronized, float syncTimeSeconds);
+    void setLastSyncEvent (uint16 streamId, SyncStatus status, float syncTimeSeconds);
 
     /** Set the synchronization accuracy metric for a particular stream */
-    void setSyncAccuracy (uint16 streamId, bool isSynchronized, float expectedMinusActual);
+    void setSyncAccuracy (uint16 streamId, SyncStatus status, float expectedMinusActual);
 
     std::unique_ptr<FifoDrawerButton> fifoDrawerButton;