Skip to content

Commit ccd1534

Browse files
committed
Rename RecordNode::eventChannelMap to eventMap
1 parent 106ef02 commit ccd1534

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

Source/Processors/RecordNode/RecordNode.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ void RecordNode::updateSubprocessorMap()
315315
}
316316
}
317317

318-
eventChannelMap.clear();
318+
eventMap.clear();
319319
syncChannelMap.clear();
320320
syncOrderMap.clear();
321321
for (int ch = 0; ch < eventChannelArray.size(); ch++)
@@ -325,10 +325,10 @@ void RecordNode::updateSubprocessorMap()
325325
int sourceID = chan->getSourceNodeID();
326326
int subProcID = chan->getSubProcessorIdx();
327327

328+
eventMap[sourceID][subProcID] = chan->getNumChannels();
329+
328330
if (dataChannelStates[sourceID][subProcID].size() && !syncChannelMap[sourceID][subProcID])
329331
{
330-
EventChannel* chan = eventChannelArray[ch];
331-
eventChannelMap[sourceID][subProcID] = chan->getNumChannels();
332332
syncOrderMap[sourceID][subProcID] = ch;
333333
syncChannelMap[sourceID][subProcID] = 0;
334334
synchronizer->setSyncChannel(chan->getSourceNodeID(), chan->getSubProcessorIdx(), ch);
@@ -350,7 +350,6 @@ void RecordNode::setMasterSubprocessor(int srcIndex, int subProcIdx)
350350

351351
void RecordNode::setSyncChannel(int srcIndex, int subProcIdx, int channel)
352352
{
353-
//eventChannelMap[srcIndex][subProcIdx];
354353
syncChannelMap[srcIndex][subProcIdx] = channel;
355354
synchronizer->setSyncChannel(srcIndex, subProcIdx, syncOrderMap[srcIndex][subProcIdx]+channel);
356355
}

Source/Processors/RecordNode/RecordNode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
109109
std::map<int, std::map<int, std::vector<bool>>> dataChannelStates;
110110
std::map<int, int> dataChannelOrder;
111111

112-
std::map<int, std::map<int, int>> eventChannelMap;
112+
std::map<int, std::map<int, int>> eventMap;
113113
std::map<int, std::map<int, int>> syncChannelMap;
114114
std::map<int, std::map<int, int>> syncOrderMap;
115115

Source/Processors/RecordNode/RecordNodeEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ void SyncControlButton::mouseUp(const MouseEvent &event)
502502
for (int i = 0; i < 8; i++)
503503
channelStates.push_back(false);
504504

505-
int nEvents = node->eventChannelMap[srcIndex][subProcIdx];
505+
int nEvents = node->eventMap[srcIndex][subProcIdx];
506506
int syncChannel = node->getSyncChannel(srcIndex,subProcIdx);
507507

508508
auto* channelSelector = new SyncChannelSelector(nEvents,syncChannel,node->isMasterSubprocessor(srcIndex, subProcIdx));

0 commit comments

Comments
 (0)