Reconnect message center to record nodes

Author: medengineer

Resources/Python/record_control_example_client.py

@@ -77,4 +77,4 @@ def run_client():
 
 
 if __name__ == '__main__':
-    run_client()
+    run_client()

Source/Processors/ProcessorGraph/ProcessorGraph.cpp

@@ -266,10 +266,10 @@ void ProcessorGraph::clearConnections()
 
     }
 
-    /*
-    addConnection(MESSAGE_CENTER_ID, midiChannelIndex,
-                  RECORD_NODE_ID, midiChannelIndex);
-    */
+    for (auto& recordNode : getRecordNodes())
+        addConnection(MESSAGE_CENTER_ID, midiChannelIndex,
+                  recordNode->getNodeId(), midiChannelIndex);
+
 }
 
 
@@ -278,10 +278,6 @@ void ProcessorGraph::updateConnections(Array<SignalChainTabButton*, CriticalSect
 
     clearConnections(); // clear processor graph
 
-    std::cout << "Updating connections:" << std::endl;
-    std::cout << std::endl;
-    std::cout << std::endl;
-
     Array<GenericProcessor*> splitters;
 
     // keep track of which splitter is currently being explored, in case there's another
@@ -453,10 +449,13 @@ void ProcessorGraph::updateConnections(Array<SignalChainTabButton*, CriticalSect
     }
 
 	getAudioNode()->updatePlaybackBuffer();
-	//Update RecordNode internal channel mappings
+
 	Array<EventChannel*> extraChannels;
 	getMessageCenter()->addSpecialProcessorChannels(extraChannels);
-	//getRecordNode()->addSpecialProcessorChannels(extraChannels);
+
+    for (auto& recordNode : getRecordNodes())
+        recordNode->addSpecialProcessorChannels(extraChannels);
+
 } // end method
 
 void ProcessorGraph::connectProcessors(GenericProcessor* source, GenericProcessor* dest,
@@ -492,12 +491,6 @@ void ProcessorGraph::connectProcessors(GenericProcessor* source, GenericProcesso
                       midiChannelIndex);      // destNodeChannelIndex
     }
 
-    // 3. connect record nodes
-    if (dest->isRecordNode())
-    {
-        ((RecordNode*)dest)->registerProcessor(source);
-    }
-
 }
 
 void ProcessorGraph::connectProcessorToAudioNode(GenericProcessor* source)
@@ -748,15 +741,6 @@ bool ProcessorGraph::disableProcessors()
 
 void ProcessorGraph::setRecordState(bool isRecording)
 {
-    // actually start recording
-    if (isRecording)
-    {
-        //getRecordNode()->setParameter(1,10.0f);
-    }
-    else
-    {
-        //getRecordNode()->setParameter(0,10.0f);
-    }
 
     for (int i = 0; i < getNumNodes(); i++)
     {
@@ -769,7 +753,6 @@ void ProcessorGraph::setRecordState(bool isRecording)
         }
     }
 
-
 }
 
 

Source/Processors/RecordNode/RecordNode.cpp

@@ -66,6 +66,45 @@ RecordNode::~RecordNode()
 {
 }
 
+void RecordNode::addInputChannel(const GenericProcessor* sourceNode, int chan)
+{
+
+	if (chan != AccessClass::getProcessorGraph()->midiChannelIndex)
+	{
+		int channelIndex = getNextChannel(false);
+
+		const DataChannel* orig = sourceNode->getDataChannel(chan);
+		DataChannel* newChannel = new DataChannel(*orig);
+		newChannel->setRecordState(orig->getRecordState());
+		dataChannelArray.add(newChannel);
+		recordEngine->addDataChannel(channelIndex, dataChannelArray[channelIndex]);
+
+	}
+	else
+	{
+
+		for (int n = 0; n < sourceNode->getTotalEventChannels(); n++)
+		{
+			const EventChannel* orig = sourceNode->getEventChannel(n);
+			//only add to the record node the events originating from this processor, to avoid duplicates
+			if (orig->getSourceNodeID() == sourceNode->getNodeId())
+				eventChannelArray.add(new EventChannel(*orig));
+
+		}
+
+	}
+
+}
+
+void RecordNode::addSpecialProcessorChannels(Array<EventChannel*>& channels)
+{
+
+	eventChannelArray.addArray(channels);
+	settings.numInputs = dataChannelArray.size();
+	setPlayConfigDetails(getNumInputs(), getNumOutputs(), 44100.0, 1024);
+
+}
+
 void RecordNode::setEngine(int index)
 {
 	availableEngines = getAvailableRecordEngines();
@@ -373,7 +412,7 @@ void RecordNode::startRecording()
 
 	int recordedProcessorIdx = -1;	
 
-	LOGD("Record Node ", getNodeId(), ": Total channels: ", totChans);
+	//LOGD("Record Node ", getNodeId(), ": Total channels: ", totChans, " Total event channels: ", getTotalEventChannels());
 
 	for (int ch = 0; ch < totChans; ++ch)
 	{
@@ -506,15 +545,15 @@ void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& e
 		int64 timestamp = Event::getTimestamp(event);
 		uint64 eventChan = event.getChannel();
 		int eventIndex;
-		if (eventInfo && samplePosition > 0)
-		{
+		if (eventInfo)
 			eventIndex = getEventChannelIndex(Event::getSourceIndex(event), Event::getSourceID(event), Event::getSubProcessorIdx(event));
-			synchronizer->addEvent(Event::getSourceID(event), Event::getSubProcessorIdx(event), eventIndex, timestamp);
-		}
 		else
 			eventIndex = -1;
 
-		if (isRecording && eventIndex >= 0)
+		if (samplePosition)
+			synchronizer->addEvent(Event::getSourceID(event), Event::getSubProcessorIdx(event), eventIndex, timestamp);
+
+		if (isRecording)
 			eventQueue->addEvent(event, timestamp, eventIndex);
 
 	}
@@ -626,13 +665,10 @@ bool RecordNode::isFirstChannelInRecordedSubprocessor(int ch)
 	return std::find(startRecChannels.begin(), startRecChannels.end(), ch) != startRecChannels.end();
 }
 
-//TODO: Need to validate these methods
-
 void RecordNode::registerProcessor(const GenericProcessor* sourceNode)
 {
 	settings.numInputs += sourceNode->getNumOutputs();
 	setPlayConfigDetails(getNumInputs(), getNumOutputs(), 44100.0, 128);
-
 	recordEngine->registerProcessor(sourceNode);
 }
 

Source/Processors/RecordNode/RecordNode.h

@@ -52,7 +52,8 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
 	AudioProcessorEditor* createEditor() override;
 	bool hasEditor() const override { return true; }
 
-	
+	void addSpecialProcessorChannels(Array<EventChannel*>& channels);
+
 	void updateSubprocessorMap();
 	void setMasterSubprocessor(int srcIdx, int subProcIdx);
 	bool isMasterSubprocessor(int srcIdx, int subProcIdx);
@@ -120,6 +121,7 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
     bool isSyncReady;
 
     //TODO: Need to validate these new methods
+	void addInputChannel(const GenericProcessor* sourceNode, int chan);
 
     /** Must be called by a spike recording source on the "enable" method
     */