Enable Record Node subprocessor fifo monitors

Author: medengineer

Source/Processors/RecordNode/DataQueue.cpp

@@ -134,7 +134,7 @@ void DataQueue::fillTimestamps(int channel, int index, int size, int64 timestamp
 	}
 }
 
-void DataQueue::writeSynchronizedTimestampChannel(double start, double step, int destChannel, int64 nSamples)
+float DataQueue::writeSynchronizedTimestampChannel(double start, double step, int destChannel, int64 nSamples)
 {
 
 	int index1, size1, index2, size2;
@@ -169,6 +169,8 @@ void DataQueue::writeSynchronizedTimestampChannel(double start, double step, int
 
 	m_FTSFifos[destChannel]->finishedWrite(size1 + size2);
 
+	return 1.0f - (float)m_FTSFifos[destChannel]->getFreeSpace() / (float)m_FTSFifos[destChannel]->getTotalSize();
+
 }
 
 

Source/Processors/RecordNode/DataQueue.h

@@ -50,7 +50,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);
-	void writeSynchronizedTimestampChannel(double start, double step, int destChannel, int64 nSamples);
+	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);
 	const AudioSampleBuffer& getAudioBufferReference() const;

Source/Processors/RecordNode/RecordNode.cpp

@@ -302,6 +302,8 @@ void RecordNode::updateSubprocessorMap()
 				ch++;
 			}
 			ch--;
+
+			fifoUsage[sourceID][subProcID] = 0.0f;
 		}
 
 	}
@@ -642,7 +644,7 @@ void RecordNode::process(AudioSampleBuffer& buffer)
 				{
 					double first = synchronizer->convertTimestamp(sourceID, subProcIdx, timestamp);
 					double second = synchronizer->convertTimestamp(sourceID, subProcIdx, timestamp + 1);
-					dataQueue->writeSynchronizedTimestampChannel(first, second - first, ftsChannelMap[ch], numSamples);
+					fifoUsage[sourceID][subProcIdx] = dataQueue->writeSynchronizedTimestampChannel(first, second - first, ftsChannelMap[ch], numSamples);
 				}
 
 				dataQueue->writeChannel(buffer, channelMap[ch], ch, numSamples, timestamp);

Source/Processors/RecordNode/RecordNode.h

@@ -115,6 +115,8 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
 	std::map<int, std::map<int, int>> syncChannelMap;
 	std::map<int, std::map<int, int>> syncOrderMap;
 
+	std::map<int, std::map<int, float>> fifoUsage;
+
 	Array<int> channelMap; //Map from record channel index to source channel index
 	Array<int> ftsChannelMap; // Map from recorded channel index to recorded source processor idx
 	std::vector<std::vector<int>> subProcessorMap;

Source/Processors/RecordNode/RecordNodeEditor.cpp

@@ -667,22 +667,16 @@ void FifoMonitor::componentBeingDeleted(Component &component)
 
 void FifoMonitor::timerCallback()
 {
-	
-	if (recordNode->recordThread->isThreadRunning())
-	{
-		//TODO: Get metric from recordThread
-		setFillPercentage(0.0f);
-	}
-	else 
-	{
-		setFillPercentage(0.0f);
-	}
 
-	if (srcID < 0)
+	if (srcID < 0) /* Disk space monitor */
 	{
 		float diskSpace = (float)recordNode->getDataDirectory().getBytesFreeOnVolume() / recordNode->getDataDirectory().getVolumeTotalSize();
 		setFillPercentage(1.0f - diskSpace);
 	}
+	else /* Subprocessor monitor */
+	{
+		setFillPercentage(recordNode->fifoUsage[srcID][subID]);
+	}
 
 }