Ignore events generated by filters coming into synchronizer

Author: medengineer

Source/Processors/RecordNode/RecordNode.cpp

@@ -325,9 +325,7 @@ void RecordNode::updateSubprocessorMap()
 		int sourceID = chan->getSourceNodeID();
 		int subProcID = chan->getSubProcessorIdx();
 
-		int chCount = 0;
-
-		if (!syncChannelMap[sourceID][subProcID])
+		if (dataChannelStates[sourceID][subProcID].size() && !syncChannelMap[sourceID][subProcID])
 		{
 			EventChannel* chan = eventChannelArray[ch];
 			eventChannelMap[sourceID][subProcID] = chan->getNumChannels();
@@ -552,7 +550,7 @@ void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& e
 		else
 			eventIndex = -1;
 
-		if (samplePosition)
+		if (samplePosition > 0 && dataChannelStates[Event::getSourceID(event)][Event::getSubProcessorIdx(event)].size())
 			synchronizer->addEvent(Event::getSourceID(event), Event::getSubProcessorIdx(event), eventIndex, timestamp);
 
 		if (isRecording)

Source/Processors/RecordNode/RecordNodeEditor.cpp

@@ -143,18 +143,22 @@ void RecordNodeEditor::saveCustomParameters(XmlElement* xml)
 		for (auto subIdx : extract_keys(recordNode->dataChannelStates[srcID]))
 		{
 
-			XmlElement* subProcNode = xmlNode->createNewChildElement("SUBPROCESSOR");
+			if (recordNode->dataChannelStates[srcID][subIdx].size() > 0)
+			{
+				XmlElement* subProcNode = xmlNode->createNewChildElement("SUBPROCESSOR");
 
-			subProcNode->setAttribute("src_id", srcID);
-			subProcNode->setAttribute("sub_idx", subIdx);
-			subProcNode->setAttribute("isMaster", recordNode->synchronizer->masterProcessor == srcID && recordNode->synchronizer->masterSubprocessor == subIdx);
-			subProcNode->setAttribute("syncChannel", recordNode->syncChannelMap[srcID][subIdx]);
+				subProcNode->setAttribute("src_id", srcID);
+				subProcNode->setAttribute("sub_idx", subIdx);
+				subProcNode->setAttribute("isMaster", recordNode->synchronizer->masterProcessor == srcID && recordNode->synchronizer->masterSubprocessor == subIdx);
+				subProcNode->setAttribute("syncChannel", recordNode->syncChannelMap[srcID][subIdx]);
 
-			XmlElement* recStateNode = subProcNode->createNewChildElement("RECORDSTATE");
+				XmlElement* recStateNode = subProcNode->createNewChildElement("RECORDSTATE");
+
+				for (int ch = 0; ch < recordNode->dataChannelStates[srcID][subIdx].size(); ch++)
+				{
+					recStateNode->setAttribute(String("CH")+String(ch), recordNode->dataChannelStates[srcID][subIdx][ch]);
+				}
 
-			for (int ch = 0; ch < recordNode->dataChannelStates[srcID][subIdx].size(); ch++)
-			{
-				recStateNode->setAttribute(String("CH")+String(ch), recordNode->dataChannelStates[srcID][subIdx][ch]);
 			}
 
 		}
@@ -177,6 +181,7 @@ void RecordNodeEditor::loadCustomParameters(XmlElement* xml)
 			eventRecord->setToggleState((bool)(xmlNode->getStringAttribute("recordEvents").getIntValue()), juce::NotificationType::dontSendNotification);
 			spikeRecord->setToggleState((bool)(xmlNode->getStringAttribute("recordSpikes").getIntValue()), juce::NotificationType::dontSendNotification);
 
+
 			forEachXmlChildElement(*xmlNode, subNode)
 			{
 				if (subNode->hasTagName("SUBPROCESSOR"))
@@ -185,17 +190,22 @@ void RecordNodeEditor::loadCustomParameters(XmlElement* xml)
 					int srcID = subNode->getIntAttribute("src_id");
 					int subIdx = subNode->getIntAttribute("sub_idx");
 
-					if (subNode->getBoolAttribute("isMaster"))
+					if (recordNode->dataChannelStates[srcID][subIdx].size())
 					{
-						recordNode->setMasterSubprocessor(srcID, subIdx);
-					}
-					recordNode->setSyncChannel(srcID, subIdx, subNode->getIntAttribute("syncChannel"));
 
-					XmlElement* recordStates = subNode->getChildByName("RECORDSTATE");
+						if (subNode->getBoolAttribute("isMaster"))
+						{
+							recordNode->setMasterSubprocessor(srcID, subIdx);
+						}
+						recordNode->setSyncChannel(srcID, subIdx, subNode->getIntAttribute("syncChannel"));
+
+						XmlElement* recordStates = subNode->getChildByName("RECORDSTATE");
+
+						for (int ch = 0; ch < recordNode->dataChannelStates[srcID][subIdx].size(); ch++)
+						{
+							recordNode->dataChannelStates[srcID][subIdx][ch] = recordStates->getIntAttribute("CH" + String(ch));
+						}
 
-					for (int ch = 0; ch < recordNode->dataChannelStates[srcID][subIdx].size(); ch++)
-					{
-						recordNode->dataChannelStates[srcID][subIdx][ch] = recordStates->getIntAttribute("CH"+String(ch));
 					}
 
 				}
@@ -240,25 +250,30 @@ void RecordNodeEditor::updateSubprocessorFifos()
 
 			for (ptr = it->second.begin(); ptr != it->second.end(); ptr++) {
 
-				String name = "SP" + String(i);
-				subProcLabels.add(new Label(name, name));
-				subProcLabels.getLast()->setBounds(13 + i * 20, 24, 40, 20);
-				subProcLabels.getLast()->setFont(Font("Small Text", 7.0f, Font::plain));
-				addAndMakeVisible(subProcLabels.getLast());
-				subProcLabels.getLast()->setVisible(false);
-
-				subProcMonitors.add(new FifoMonitor(recordNode, it->first, ptr->first));
-				subProcMonitors.getLast()->setBounds(18 + i * 20, 43, 15, 62);
-				addAndMakeVisible(subProcMonitors.getLast());
-				subProcMonitors.getLast()->setVisible(false);
-
-				subProcRecords.add(new SyncControlButton(recordNode, "SP" + String(i), it->first, ptr->first));
-				subProcRecords.getLast()->setBounds(18 + i * 20, 110, 15, 15);
-				subProcRecords.getLast()->addListener(this);
-				addAndMakeVisible(subProcRecords.getLast());
-				subProcRecords.getLast()->setVisible(false);
-
-				i++;
+				if (recordNode->dataChannelStates[it->first][ptr->first].size())
+				{
+
+					String name = "SP" + String(i);
+					subProcLabels.add(new Label(name, name));
+					subProcLabels.getLast()->setBounds(13 + i * 20, 24, 40, 20);
+					subProcLabels.getLast()->setFont(Font("Small Text", 7.0f, Font::plain));
+					addAndMakeVisible(subProcLabels.getLast());
+					subProcLabels.getLast()->setVisible(false);
+
+					subProcMonitors.add(new FifoMonitor(recordNode, it->first, ptr->first));
+					subProcMonitors.getLast()->setBounds(18 + i * 20, 43, 15, 62);
+					addAndMakeVisible(subProcMonitors.getLast());
+					subProcMonitors.getLast()->setVisible(false);
+
+					subProcRecords.add(new SyncControlButton(recordNode, "SP" + String(i), it->first, ptr->first));
+					subProcRecords.getLast()->setBounds(18 + i * 20, 110, 15, 15);
+					subProcRecords.getLast()->addListener(this);
+					addAndMakeVisible(subProcRecords.getLast());
+					subProcRecords.getLast()->setVisible(false);
+
+					i++;
+
+				}
 
 			}
 		}