Merge branch 'write-gen-ts' into development-juce8

Author: medengineer

Source/Processors/RecordNode/RecordNode.cpp

@@ -903,11 +903,20 @@ void RecordNode::process (AudioBuffer<float>& buffer)
 
             float totalFifoUsage = 0.0f;
 
+            double first, second;
+
             if (numSamples > 0)
             {
-                double first = synchronizer.convertSampleNumberToTimestamp (streamKey, sampleNumber);
-                double second = synchronizer.convertSampleNumberToTimestamp (streamKey, sampleNumber + 1);
-
+                if (!stream->generatesTimestamps())
+                {
+                    first = synchronizer.convertSampleNumberToTimestamp (streamKey, sampleNumber);
+                    second = synchronizer.convertSampleNumberToTimestamp (streamKey, sampleNumber + 1);
+                }
+                else
+                {
+                    first = getFirstTimestampForBlock (streamId);
+                    second = first + 1 / stream->getSampleRate();
+                }
                 dataQueue->writeSynchronizedTimestamps (
                     first,
                     second - first,

Source/Processors/Settings/DataStream.cpp

@@ -34,6 +34,7 @@ DataStream::DataStream (DataStream::Settings settings)
     : InfoObject (InfoObject::Type::DATASTREAM_INFO),
       ParameterOwner (ParameterOwner::Type::DATASTREAM),
       m_sample_rate (settings.sample_rate),
+      m_generates_timestamps (settings.generates_timestamps),
       device (nullptr)
 {
     setName (settings.name);
@@ -88,6 +89,11 @@ float DataStream::getSampleRate() const
     return m_sample_rate;
 }
 
+bool DataStream::generatesTimestamps() const
+{
+    return m_generates_timestamps;
+}
+
 int DataStream::getChannelCount() const
 {
     return continuousChannels.size();

Source/Processors/Settings/DataStream.h

@@ -80,6 +80,7 @@ class PLUGIN_API DataStream : public InfoObject,
         String identifier;
 
         float sample_rate;
+        bool generates_timestamps;
     };
 
     /** Constructor */
@@ -118,6 +119,9 @@ class PLUGIN_API DataStream : public InfoObject,
     /** Returns true if this DataStream has a device associated with it.*/
     bool hasDevice() const;
 
+    /** Returns true if this DataStream generates timestamps. */
+    bool generatesTimestamps() const;
+
     /** Gets all of the continuous channels for this stream.*/
     Array<ContinuousChannel*> getContinuousChannels() const;
 
@@ -137,6 +141,7 @@ class PLUGIN_API DataStream : public InfoObject,
     Array<SpikeChannel*> spikeChannels;
 
     float m_sample_rate;
+    bool m_generates_timestamps;
 
     uint16 streamId;
 };