Register record nodes with source processors

Author: medengineer

JuceLibraryCode/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp

@@ -914,7 +914,7 @@ struct RenderingOpSequenceCalculator
         }
         else
         {
-            jassert (bufferNum >= 0 && bufferNum < nodeIds.size());
+            //jassert (bufferNum >= 0 && bufferNum < nodeIds.size());
 
             nodeIds.set (bufferNum, nodeId);
             channels.set (bufferNum, outputIndex);

Source/Processors/ProcessorGraph/ProcessorGraph.cpp

@@ -492,6 +492,12 @@ void ProcessorGraph::connectProcessors(GenericProcessor* source, GenericProcesso
                       midiChannelIndex);      // destNodeChannelIndex
     }
 
+    // 3. connect record nodes
+    if (dest->isRecordNode())
+    {
+        ((RecordNode*)dest)->registerProcessor(source);
+    }
+
 }
 
 void ProcessorGraph::connectProcessorToAudioNode(GenericProcessor* source)

Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.cpp

@@ -91,7 +91,7 @@ void OriginalRecording::openFiles(File rootFolder, int experimentNumber, int rec
 	processorArray.clear();
 	lastProcId = 0;
 
-	openFile(rootFolder, getEventChannel(0), 0);
+	//openFile(rootFolder, getEventChannel(0), 0);
 	openMessageFile(rootFolder);
 
 	int nChannels = getNumRecordedChannels();

Source/Processors/RecordNode/RecordNode.cpp

@@ -340,8 +340,21 @@ void RecordNode::updateSettings()
 
 bool RecordNode::enable()
 {
+
+	if (hasRecorded)
+	{
+		hasRecorded = false;
+		experimentNumber++;
+		settingsNeeded = true;
+	}
+
+	recordingNumber = -1;
+	recordEngine->configureEngine();
+	recordEngine->startAcquisition();
+
     synchronizer->reset();
     return true;
+
 }
 
 void RecordNode::startRecording()
@@ -358,7 +371,9 @@ void RecordNode::startRecording()
 	int procIndex = -1;
 	int chanSubIdx = 0;
 
-	int recordedProcessorIdx = -1;
+	int recordedProcessorIdx = -1;	
+
+	LOGD("Record Node ", getNodeId(), ": Total channels: ", totChans);
 
 	for (int ch = 0; ch < totChans; ++ch)
 	{
@@ -397,7 +412,7 @@ void RecordNode::startRecording()
 	validBlocks.insertMultiple(0, false, getNumInputs());
 
 	recordEngine->registerRecordNode(this);
-	recordEngine->resetChannels();
+	//recordEngine->resetChannels();
 	recordEngine->setChannelMapping(channelMap, chanProcessorMap, chanOrderinProc, procInfo);
 	recordThread->setChannelMap(channelMap);
 	recordThread->setFTSChannelMap(ftsChannelMap);
@@ -613,6 +628,14 @@ bool RecordNode::isFirstChannelInRecordedSubprocessor(int ch)
 
 //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);
+}
+
 void RecordNode::registerSpikeSource(const GenericProcessor *processor)
 {
 	recordEngine->registerSpikeSource(processor);

Source/Processors/RecordNode/RecordNode.h

@@ -144,6 +144,8 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
     */
     float getFreeSpace() const;
 
+	void registerProcessor(const GenericProcessor* sourceNode);
+
     /** Adds a Record Engine to use
     */
     void registerRecordEngine(RecordEngine *engine);

Source/UI/ControlPanel.cpp

@@ -971,7 +971,7 @@ void ControlPanel::comboBoxChanged(ComboBox* combo)
         if (recordEngines[lastEngineIndex]->isWindowOpen())
             recordEngines[lastEngineIndex]->toggleConfigWindow();
     }
-    RecordEngine* re;
+    ScopedPointer<RecordEngine> re;
     //AccessClass::getProcessorGraph()->getRecordNode()->clearRecordEngines();
     if (combo->getSelectedId() > 0)
     {