Merge branch 'tne-lab-fix-audio-node' into testing

Author: aacuevas

Source/Processors/AudioNode/AudioNode.cpp

@@ -29,13 +29,13 @@ AudioNode::AudioNode()
     : GenericProcessor("Audio Node"), audioEditor(0), volume(0.00001f), noiseGateLevel(0.0f)
 {
 
-    settings.numInputs = 4096;
+    // settings.numInputs = 4096;
     settings.numOutputs = 2;
 
-    // 128 inputs, 2 outputs (left and right channel)
-    setPlayConfigDetails(getNumInputs(), getNumOutputs(), 44100.0, 128);
+    //updatePlaybackBuffer();
 
-    nextAvailableChannel = 2; // keep first two channels empty
+    //nextAvailableChannel = 2; // keep first two channels empty
+    resetConnections();
 
     tempBuffer = new AudioSampleBuffer(16, 1024);
 
@@ -57,12 +57,19 @@ AudioProcessorEditor* AudioNode::createEditor()
 
 void AudioNode::resetConnections()
 {
-
+    settings.numInputs = 2; // "dummy" inputs that are actually just outputs
     nextAvailableChannel = 2; // start connections at channel 2
     wasConnected = false;
 
     dataChannelArray.clear();
 
+    updatePlaybackBuffer();
+}
+
+void AudioNode::registerProcessor(const GenericProcessor* sourceNode)
+{
+    settings.numInputs += sourceNode->getNumOutputs();
+    updatePlaybackBuffer();
 }
 
 void AudioNode::updateBufferSize()
@@ -94,7 +101,7 @@ void AudioNode::setChannel(const DataChannel* ch)
 void AudioNode::setChannelStatus(const DataChannel* chan, bool status)
 {
 
-    setChannel(chan); // add 2 to account for 2 output channels
+    setChannel(chan);
 
     enableCurrentChannel(status);
 
@@ -116,12 +123,8 @@ void AudioNode::enableCurrentChannel(bool state)
 
 void AudioNode::addInputChannel(GenericProcessor* sourceNode, int chan)
 {
-
-
     int channelIndex = getNextChannel(false);
 
-    //setPlayConfigDetails(channelIndex+1,0,44100.0,128);
-
     auto dataChannel = sourceNode->getDataChannel(chan);
     auto dataChannelCopy = new DataChannel(*dataChannel);
     dataChannelCopy->setMonitored(dataChannel->isMonitored());
@@ -132,7 +135,7 @@ void AudioNode::addInputChannel(GenericProcessor* sourceNode, int chan)
 
 void AudioNode::updatePlaybackBuffer()
 {
-	setPlayConfigDetails(dataChannelArray.size(), 0, 44100.0, 128);
+	setPlayConfigDetails(getNumInputs(), 2, 44100.0, 128);
 }
 
 void AudioNode::setParameter(int parameterIndex, float newValue)
@@ -256,12 +259,13 @@ void AudioNode::process(AudioSampleBuffer& buffer)
         AudioSampleBuffer* overflowBuffer;
         AudioSampleBuffer* backupBuffer;
 
-        if (dataChannelArray.size() > 0) // we have some channels
+        int nInputs = dataChannelArray.size();
+        if (nInputs > 0) // we have some channels
         {
 
 //            tempBuffer->clear();
 
-            for (int i = 0; i < buffer.getNumChannels()-2; i++) // cycle through them all
+            for (int i = 0; i < nInputs; i++) // cycle through them all
             {
 
                 if (dataChannelArray[i]->isMonitored())

Source/Processors/AudioNode/AudioNode.h

@@ -129,6 +129,9 @@ class AudioNode : public GenericProcessor
 	//Called by ProcessorGraph
 	void updateRecordChannelIndexes();
 
+    // expand # of inputs for each connected processor
+    void registerProcessor(const GenericProcessor* sourceNode);
+
 private:
 	void recreateBuffers();
 

Source/Processors/GenericProcessor/GenericProcessor.cpp

@@ -364,11 +364,15 @@ void GenericProcessor::update()
 
 		for (int i = 0; i < dataChannelArray.size(); i++)
 		{
-			if (i < m_recordStatus.size())
-				dataChannelArray[i]->setRecordState(m_recordStatus[i]);
-			else
-				if (isSource())
-					dataChannelArray[i]->setRecordState(true);
+            if (i < m_recordStatus.size())
+            {
+                dataChannelArray[i]->setRecordState(m_recordStatus[i]);
+                dataChannelArray[i]->setMonitored(m_monitorStatus[i]);
+            }
+            else if (isSource())
+            {
+                dataChannelArray[i]->setRecordState(true);
+            }
 		}
 	}
 

Source/Processors/ProcessorGraph/ProcessorGraph.cpp

@@ -476,19 +476,14 @@ void ProcessorGraph::connectProcessorToAudioAndRecordNodes(GenericProcessor* sou
     if (source == nullptr)
         return;
 
+    getAudioNode()->registerProcessor(source);
     getRecordNode()->registerProcessor(source);
 
     for (int chan = 0; chan < source->getNumOutputs(); chan++)
     {
 
         getAudioNode()->addInputChannel(source, chan);
 
-        // THIS IS A HACK TO MAKE SURE AUDIO NODE KNOWS WHAT THE SAMPLE RATE SHOULD BE
-        // IT CAN CAUSE PROBLEMS IF THE SAMPLE RATE VARIES ACROSS PROCESSORS
-
-		//TODO: See if this causes problems with the newer architectures
-        //getAudioNode()->settings.sampleRate = source->getSampleRate();
-
         addConnection(source->getNodeId(),                   // sourceNodeID
                       chan,                                  // sourceNodeChannelIndex
                       AUDIO_NODE_ID,                         // destNodeID