Fix issues with Message Center not communicating with Record Nodes

Author: jsiegle

Source/Processors/MessageCenter/MessageCenter.cpp

@@ -36,22 +36,35 @@ GenericProcessor("Message Center"), newEventAvailable(false), isRecording(false)
                          0, // number of outputs
                          44100.0, // sampleRate
                          128);    // blockSize
+
+    eventChannel = nullptr;
+
 }
 
 MessageCenter::~MessageCenter()
 {
 
 }
 
-void MessageCenter::addSpecialProcessorChannels(Array<EventChannel*>& channels) 
+void MessageCenter::addSpecialProcessorChannels() 
 {
-	clearSettings();
-	EventChannel* chan = new EventChannel(EventChannel::TEXT, 1, MAX_MSG_LENGTH, CoreServices::getGlobalSampleRate(), this, 0);
-	chan->setName("GUI Messages");
-	chan->setDescription("Messages from the GUI Message Center");
-	channels.add(chan);
-	eventChannelArray.add(new EventChannel(*chan));
-	updateChannelIndexes();
+
+    if (eventChannel == nullptr)
+    {
+        clearSettings();
+
+        eventChannel = new EventChannel(EventChannel::TEXT, 
+                                            1, 
+                                            MAX_MSG_LENGTH, 
+                                            CoreServices::getGlobalSampleRate(), 
+                                            this, 0);
+
+        eventChannel->setName("GUI Messages");
+        eventChannel->setDescription("Messages from the GUI Message Center");
+        eventChannelArray.add(new EventChannel(*eventChannel));
+
+        updateChannelIndexes();
+    }
 }
 
 AudioProcessorEditor* MessageCenter::createEditor()
@@ -119,6 +132,8 @@ void MessageCenter::process(AudioSampleBuffer& buffer)
 		TextEventPtr event = TextEvent::createTextEvent(getEventChannel(0), CoreServices::getGlobalTimestamp(), eventString);
 		addEvent(getEventChannel(0), event, 0);
 
+        std::cout << "Message Center added event." << std::endl;
+
         newEventAvailable = false;
     }
 

Source/Processors/MessageCenter/MessageCenter.h

@@ -77,13 +77,15 @@ class MessageCenter : public GenericProcessor
         needsToSendTimestampMessage = false;
     }
 
-	void addSpecialProcessorChannels(Array<EventChannel*>& channel);
+	void addSpecialProcessorChannels();
 private:
 
     bool newEventAvailable;
     bool isRecording;
     bool needsToSendTimestampMessage;
 
+    ScopedPointer<EventChannel> eventChannel;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MessageCenter);
 
 };

Source/Processors/ProcessorGraph/ProcessorGraph.cpp

@@ -346,6 +346,9 @@ void ProcessorGraph::updateConnections(Array<SignalChainTabButton*, CriticalSect
                 //TODO: This is will be removed when probe based audio node added. 
                 connectProcessorToAudioNode(source);
 
+                //if (source->isRecordNode())
+                 //   connectProcessorToMessageCenter(source);
+
                 // find the next dest that's not a merger or splitter
                 GenericProcessor* prev = source;
 
@@ -448,8 +451,8 @@ void ProcessorGraph::updateConnections(Array<SignalChainTabButton*, CriticalSect
         }
     }
 
-    Array<EventChannel*> extraChannels;
-    getMessageCenter()->addSpecialProcessorChannels(extraChannels);
+    //OwnedArray<EventChannel> extraChannels;
+    getMessageCenter()->addSpecialProcessorChannels();
 
 	getAudioNode()->updatePlaybackBuffer();
 
@@ -555,6 +558,19 @@ void ProcessorGraph::connectProcessorToAudioNode(GenericProcessor* source)
 
 }
 
+
+void ProcessorGraph::connectProcessorToMessageCenter(GenericProcessor* source)
+{
+
+    // connect event channel
+    addConnection(getMessageCenter()->getNodeId(),    // sourceNodeID
+                  midiChannelIndex,       // sourceNodeChannelIndex
+                  source->getNodeId(),          // destNodeID
+                  midiChannelIndex);      // destNodeChannelIndex
+
+}
+
+
 GenericProcessor* ProcessorGraph::createProcessorFromDescription(Array<var>& description)
 {
 	GenericProcessor* processor = nullptr;

Source/Processors/ProcessorGraph/ProcessorGraph.h

@@ -119,6 +119,7 @@ class ProcessorGraph    : public AudioProcessorGraph
     void connectProcessors(GenericProcessor* source, GenericProcessor* dest,
         bool connectContinuous, bool connectEvents);
     void connectProcessorToAudioNode(GenericProcessor* source);
+    void connectProcessorToMessageCenter(GenericProcessor* source);
 
 	int64 m_startSoftTimestamp{ 0 };
 	const GenericProcessor* m_timestampSource{ nullptr };

Source/Processors/RecordNode/RecordNode.cpp

@@ -74,11 +74,13 @@ RecordNode::~RecordNode()
 void RecordNode::connectToMessageCenter()
 {
 
-	const EventChannel* orig = AccessClass::getMessageCenter()->messageCenter->getEventChannel(0);
+	const EventChannel* orig = AccessClass::getMessageCenter()->messageCenter->getMessageChannel();
 	eventChannelArray.add(new EventChannel(*orig));
 
 	isConnectedToMessageCenter = true;
 
+	std::cout << "Record node " << getNodeId() << " connected to Message Center" << std::endl;
+
 }
 
 void RecordNode::addInputChannel(const GenericProcessor* sourceNode, int chan)
@@ -280,6 +282,7 @@ void RecordNode::updateChannelStates(int srcIndex, int subProcIdx, std::vector<b
 
 void RecordNode::updateSubprocessorMap()
 {
+
 
     std::map<int, std::vector<int>> inputs;
 
@@ -411,6 +414,8 @@ void RecordNode::updateSettings()
 bool RecordNode::enable()
 {
 
+	connectToMessageCenter();
+
 	if (hasRecorded)
 	{
 		hasRecorded = false;
@@ -497,8 +502,7 @@ void RecordNode::startRecording()
 
 	hasRecorded = true;
 
-	if (!isConnectedToMessageCenter)
-		connectToMessageCenter();
+	
 
 	/* Set write properties */
 	setFirstBlock = false;
@@ -575,7 +579,10 @@ void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& e
 	if (Event::getSourceID(event) > 900)
 	{
 		if (!msgCenterMessages.contains(Event::getTimestamp(event)))
+		{
 			msgCenterMessages.add(Event::getTimestamp(event));
+			std::cout << "Received event." << std::endl;
+		}
 		else
 			return;
 	}
@@ -584,6 +591,8 @@ void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& e
 
 	if (recordEvents) 
 	{
+		
+
 		int64 timestamp = Event::getTimestamp(event);
 		uint64 eventChan = event.getChannel();
 		int eventIndex;