Simplify handling sample rates and events in LFP viewer

Author: ethanbb

Plugins/LfpDisplayNode/LfpDisplayEditor.cpp

@@ -105,11 +105,11 @@ void LfpDisplayEditor::comboBoxChanged(juce::ComboBox *cb)
 {
     if (cb == subprocessorSelection)
     {
-		std::cout << "Setting subprocessor to " << cb->getSelectedId() << std::endl;
+        std::cout << "Setting subprocessor to " << cb->getSelectedId() << std::endl;
         uint32 subproc = inputSubprocessors[cb->getSelectedId() - 1];
 
         String sampleRateLabelText = "Sample Rate: ";
-		sampleRateLabelText += String(inputSampleRates[subproc]);
+		sampleRateLabelText += String(lfpProcessor->getSubprocessorSampleRate(subproc));
 		subprocessorSampleRateLabel->setText(sampleRateLabelText, dontSendNotification);
         std::cout << sampleRateLabelText << std::endl;
 
@@ -125,7 +125,6 @@ void LfpDisplayEditor::updateSubprocessorSelectorOptions()
 {
     // clear out the old data
     inputSubprocessors.clear();
-    inputSampleRates.clear();
     subprocessorSelection->clear(dontSendNotification);
 
 	if (lfpProcessor->getTotalDataChannels() != 0)
@@ -140,12 +139,10 @@ void LfpDisplayEditor::updateSubprocessorSelectorOptions()
 			uint16 subProcessorIdx = ch->getSubProcessorIdx();
             uint32 subProcFullId = GenericProcessor::getProcessorFullId(sourceNodeId, subProcessorIdx);
 
-			bool success = inputSubprocessors.add(subProcFullId);
+			bool added = inputSubprocessors.add(subProcFullId);
 
-            if (success)
+            if (added)
             {
-                inputSampleRates.set(subProcFullId, ch->getSampleRate());
-                
                 String sourceName = ch->getSourceName();
                 subprocessorNames.set(subProcFullId,
                     sourceName + " " + String(sourceNodeId) + "/" + String(subProcessorIdx));

Plugins/LfpDisplayNode/LfpDisplayEditor.h

@@ -79,7 +79,6 @@ class LfpDisplayEditor : public VisualizerEditor,
 
 private:
 
-    HashMap<int, float> inputSampleRates; // hold the possible subprocessor sample rates
     SortedSet<uint32> inputSubprocessors;
 
     LfpDisplayNode* lfpProcessor;

Plugins/LfpDisplayNode/LfpDisplayNode.cpp

@@ -99,7 +99,7 @@ void LfpDisplayNode::updateSettings()
     }
 
     int numChans = getNumSubprocessorChannels();
-    int srate = getSubprocessorSampleRate();
+    int srate = getSubprocessorSampleRate(subprocessorToDraw);
 
 	std::cout << "Re-setting num inputs on LfpDisplayNode to " << numChans << std::endl;
     if (numChans > 0)
@@ -136,15 +136,7 @@ void LfpDisplayNode::updateSettings()
 
 uint32 LfpDisplayNode::getEventSourceId(const EventChannel* event)
 {
-
-	if (event->getTimestampOrigin() == EventChannel::timestampsDerivedFromChannel)
-	{
-		return getProcessorFullId(event->getTimestampOriginProcessor(), event->getTimestampOriginSubProcessor());
-	}
-	else
-	{
-		return getChannelSourceId(event);
-	}
+    return getProcessorFullId(event->getTimestampOriginProcessor(), event->getTimestampOriginSubProcessor());
 }
 
 uint32 LfpDisplayNode::getChannelSourceId(const InfoObjectCommon* chan)
@@ -184,18 +176,19 @@ int LfpDisplayNode::getNumSubprocessorChannels()
     return 0;
 }
 
-float LfpDisplayNode::getSubprocessorSampleRate()
+float LfpDisplayNode::getSubprocessorSampleRate(uint32 subprocId)
 {
-    if (subprocessorToDraw != 0)
+    auto entry = subprocessorSampleRate.find(subprocId);
+    if (entry != subprocessorSampleRate.end())
     {
-        return subprocessorSampleRate[subprocessorToDraw];
+        return entry->second;
     }
     return 0.0f;
 }
 
 bool LfpDisplayNode::resizeBuffer()
 {
-	int nSamples = (int)getSubprocessorSampleRate() * bufferLength;
+	int nSamples = (int)getSubprocessorSampleRate(subprocessorToDraw) * bufferLength;
 	int nInputs = getNumSubprocessorChannels();
 
 	std::cout << "Resizing buffer. Samples: " << nSamples << ", Inputs: " << nInputs << std::endl;
@@ -269,12 +262,15 @@ void LfpDisplayNode::handleEvent(const EventChannel* eventInfo, const MidiMessag
         const int eventId = ttl->getState() ? 1 : 0;
         const int eventChannel = ttl->getChannel();
         const int eventTime = samplePosition;
+
+        // find sample rate of event channel
         uint32 eventSourceNodeId = getEventSourceId(eventInfo);
-        
-        // treat events with no source as occurring on the subprocessor being drawn.
-        if (eventSourceNodeId == 0)
+        float eventSampleRate = getSubprocessorSampleRate(eventSourceNodeId);
+
+        if (eventSampleRate == 0)
         {
-            eventSourceNodeId = subprocessorToDraw;
+            // shouldn't happen for any real event channel at this point
+            return;
         }
 
 		//std::cout << "Received event on channel " << eventChannel << std::endl;

Plugins/LfpDisplayNode/LfpDisplayNode.h

@@ -73,7 +73,7 @@ class LfpDisplayNode :  public GenericProcessor
 
 	int getNumSubprocessorChannels();
 
-	float getSubprocessorSampleRate();
+    float getSubprocessorSampleRate(uint32 subprocId);
 
     uint32 getDataSubprocId(int chan) const;