Fix audio monitor indexing issue when toggling while acquisition is active

Author: aacuevas

Source/Processors/AudioNode/AudioNode.cpp

@@ -75,7 +75,16 @@ void AudioNode::updateBufferSize()
 void AudioNode::setChannel(const DataChannel* ch)
 {
 
-	int channelNum = getDataChannelIndex(ch->getSourceIndex(), ch->getSourceNodeID(), ch->getSubProcessorIdx());
+	int channelNum;
+
+	try 
+	{
+		channelNum = audioDataChannelMap.at(ch->getCurrentNodeID()).at(ch->getCurrentNodeChannelIdx());
+	}
+	catch (...)
+	{
+		channelNum = -1;
+	}
 
     std::cout << "Audio node setting channel to " << channelNum << std::endl;
 
@@ -249,7 +258,7 @@ void AudioNode::process(AudioSampleBuffer& buffer)
 
             for (int i = 0; i < buffer.getNumChannels()-2; i++) // cycle through them all
             {
-                
+
                 if (dataChannelArray[i]->isMonitored())
                 {
                     tempBuffer->clear();
@@ -476,6 +485,14 @@ void AudioNode::updateRecordChannelIndexes()
 {
 	//Keep the nodeIDs of the original processor from each channel comes from
 	updateChannelIndexes(false);
+	//and update the internal map
+	audioDataChannelMap.clear();
+	unsigned int nChans = dataChannelArray.size();
+	for (int i = 0; i < nChans; i++)
+	{
+		DataChannel* ch = dataChannelArray[i];
+		audioDataChannelMap[ch->getCurrentNodeID()][ch->getCurrentNodeChannelIdx()] = i;
+	}
 }
 
 // ==========================================================

Source/Processors/AudioNode/AudioNode.h

@@ -158,6 +158,9 @@ class AudioNode : public GenericProcessor
     // Temporary buffer for data
     ScopedPointer<AudioSampleBuffer> tempBuffer;
 
+	//private map for datachannels with info relative to multiple processors
+	std::unordered_map<uint16, std::map<uint16, int>> audioDataChannelMap;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(AudioNode);
 
 };

Source/Processors/GenericProcessor/GenericProcessor.cpp

@@ -405,8 +405,10 @@ void GenericProcessor::updateChannelIndexes(bool updateNodeID)
 	dataChannelMap.clear();
 	eventChannelMap.clear();
 	spikeChannelMap.clear();
-
-	for (int i = 0; i < dataChannelArray.size(); i++)
+	unsigned int nChans;
+	
+	nChans = dataChannelArray.size();
+	for (int i = 0; i < nChans; i++)
 	{
 		DataChannel* channel = dataChannelArray[i];
 		if (updateNodeID)
@@ -419,7 +421,8 @@ void GenericProcessor::updateChannelIndexes(bool updateNodeID)
 		uint32 sourceID = getProcessorFullId(channel->getSourceNodeID(), channel->getSubProcessorIdx());
 		dataChannelMap[sourceID][channel->getSourceIndex()] = i;
 	}
-	for (int i = 0; i < eventChannelArray.size(); i++)
+	nChans = eventChannelArray.size();
+	for (int i = 0; i < nChans; i++)
 	{
 		EventChannel* channel = eventChannelArray[i];
 		if (updateNodeID)
@@ -432,7 +435,8 @@ void GenericProcessor::updateChannelIndexes(bool updateNodeID)
 		uint32 sourceID = getProcessorFullId(channel->getSourceNodeID(), channel->getSubProcessorIdx());
 		eventChannelMap[sourceID][channel->getSourceIndex()] = i;
 	}
-	for (int i = 0; i < spikeChannelArray.size(); i++)
+	nChans = spikeChannelArray.size();
+	for (int i = 0; i < nChans; i++)
 	{
 		SpikeChannel* channel = spikeChannelArray[i];
 		if (updateNodeID)