Update logic for when to use synchronizer dependent methods

Author: medengineer

Source/Processors/RecordNode/DataQueue.cpp

@@ -174,7 +174,7 @@ float DataQueue::writeSynchronizedTimestampChannel(double start, double step, in
 }
 
 
-void DataQueue::writeChannel(const AudioSampleBuffer& buffer, int srcChannel, int destChannel, int nSamples, int64 timestamp)
+float DataQueue::writeChannel(const AudioSampleBuffer& buffer, int srcChannel, int destChannel, int nSamples, int64 timestamp)
 {
 	int index1, size1, index2, size2;
 	m_fifos[destChannel]->prepareToWrite(nSamples, index1, size1, index2, size2);
@@ -205,6 +205,8 @@ void DataQueue::writeChannel(const AudioSampleBuffer& buffer, int srcChannel, in
 		fillTimestamps(destChannel, index2, size2, timestamp + size1);
 	}
 	m_fifos[destChannel]->finishedWrite(size1 + size2);
+
+	return 1.0f - (float)m_fifos[destChannel]->getFreeSpace() / (float)m_fifos[destChannel]->getTotalSize();
 }
 
 /*

Source/Processors/RecordNode/DataQueue.h

@@ -49,7 +49,7 @@ class DataQueue
 
 	//Only the methods after this comment are considered thread-safe.
 	//Caution must be had to avoid calling more than one of the methods above simulatenously
-	void writeChannel(const AudioSampleBuffer& buffer, int srcChannel, int destChannel, int nSamples, int64 timestamp);
+	float writeChannel(const AudioSampleBuffer& buffer, int srcChannel, int destChannel, int nSamples, int64 timestamp);
 	float writeSynchronizedTimestampChannel(double start, double step, int destChannel, int64 nSamples);
 	bool startRead(Array<CircularBufferIndexes>& indexes, Array<int64>& timestamps, int nMax);
 	bool startSynchronizedRead(Array<CircularBufferIndexes>& dataIndexes, Array<CircularBufferIndexes>& ftsIndexes, Array<int64>& timestamps, int nMax);

Source/Processors/RecordNode/RecordNode.cpp

@@ -520,6 +520,8 @@ void RecordNode::startRecording()
 		}
 		*/
 
+		useSynchronizer = static_cast<RecordNodeEditor*> (getEditor())->getSelectedEngineIdx() == 0;
+
 		recordThread->setFileComponents(rootFolder, experimentNumber, recordingNumber);
 		recordThread->startThread();
 		isRecording = true;
@@ -657,9 +659,21 @@ void RecordNode::process(AudioSampleBuffer& buffer)
 
 				if (isFirstChannelInRecordedSubprocessor(channelMap[ch]))
 				{
-					double first = synchronizer->convertTimestamp(sourceID, subProcIdx, timestamp);
-					double second = synchronizer->convertTimestamp(sourceID, subProcIdx, timestamp + 1);
-					fifoUsage[sourceID][subProcIdx] = dataQueue->writeSynchronizedTimestampChannel(first, second - first, ftsChannelMap[ch], numSamples);
+					
+					if (useSynchronizer)
+					{
+						double first = synchronizer->convertTimestamp(sourceID, subProcIdx, timestamp);
+						double second = synchronizer->convertTimestamp(sourceID, subProcIdx, timestamp + 1);
+						fifoUsage[sourceID][subProcIdx] = dataQueue->writeSynchronizedTimestampChannel(first, second - first, ftsChannelMap[ch], numSamples);
+					}
+					else
+					{
+						fifoUsage[sourceID][subProcIdx] = dataQueue->writeChannel(buffer, channelMap[ch], ch, numSamples, timestamp);
+						samplesWritten+=numSamples;
+						continue;
+					}
+					
+
 				}
 
 				dataQueue->writeChannel(buffer, channelMap[ch], ch, numSamples, timestamp);

Source/Processors/RecordNode/RecordNode.h

@@ -167,6 +167,8 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
 
 private:
 
+	bool useSynchronizer; 
+
 	bool receivedSoftwareTime;
 
 	int lastDataChannelArraySize;

Source/Processors/RecordNode/RecordNodeEditor.cpp

@@ -214,6 +214,11 @@ void RecordNodeEditor::loadCustomParameters(XmlElement* xml)
 
 }
 
+int RecordNodeEditor::getSelectedEngineIdx()
+{
+	return engineSelectCombo->getSelectedId()-1;
+}
+
 void RecordNodeEditor::timerCallback()
 {
 

Source/Processors/RecordNode/RecordNodeEditor.h

@@ -112,6 +112,8 @@ class RecordNodeEditor : public GenericEditor, ComboBoxListener
 
 	void updateSubprocessorFifos();
 	void showSubprocessorFifos(bool);
+
+	int getSelectedEngineIdx();
 
     bool subprocessorsVisible;