Skip to content

Commit c975498

Browse files
committed
Disable merge events selector
1 parent a870312 commit c975498

1 file changed

Lines changed: 2 additions & 24 deletions

File tree

Source/Processors/Merger/MergerEditor.cpp

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void MergerEditor::mouseDown(const MouseEvent& e)
179179

180180
PopupMenu menu;
181181
int menuItemIndex = 1;
182-
int eventMergeIndexA, eventMergeIndexB, continuousMergeIndexA, continuousMergeIndexB = -1;
182+
int continuousMergeIndexA, continuousMergeIndexB = -1;
183183
int inputSelectionIndexA, inputSelectionIndexB = -1;
184184

185185
Array<GenericProcessor*> selectableProcessors = getSelectableProcessors();
@@ -190,14 +190,8 @@ void MergerEditor::mouseDown(const MouseEvent& e)
190190
"Input A: " + getNameString(merger->sourceNodeA), // message
191191
false); // isSelectable
192192

193-
eventMergeIndexA = ++menuItemIndex;
194193
continuousMergeIndexA = ++menuItemIndex;
195194

196-
menu.addItem(eventMergeIndexA,
197-
"Merge event data",
198-
!acquisitionIsActive,
199-
merger->mergeEventsA);
200-
201195
menu.addItem(continuousMergeIndexA,
202196
"Merge continuous data",
203197
!acquisitionIsActive,
@@ -236,14 +230,8 @@ void MergerEditor::mouseDown(const MouseEvent& e)
236230
"Input B: " + getNameString(merger->sourceNodeB), // message
237231
false); // isSelectable
238232

239-
eventMergeIndexB = ++menuItemIndex;
240233
continuousMergeIndexB = ++menuItemIndex;
241234

242-
menu.addItem(eventMergeIndexB,
243-
"Merge event data",
244-
!acquisitionIsActive,
245-
merger->mergeEventsB);
246-
247235
menu.addItem(continuousMergeIndexB,
248236
"Merge continuous data",
249237
!acquisitionIsActive,
@@ -276,21 +264,11 @@ void MergerEditor::mouseDown(const MouseEvent& e)
276264
std::cout << "Selection: " << result << std::endl;
277265

278266

279-
if (result == eventMergeIndexA)
280-
{
281-
merger->mergeEventsA = !(merger->mergeEventsA);
282-
CoreServices::updateSignalChain(this);
283-
return;
284-
} else if (result == continuousMergeIndexA)
267+
if (result == continuousMergeIndexA)
285268
{
286269
merger->mergeContinuousA = !merger->mergeContinuousA;
287270
CoreServices::updateSignalChain(this);
288271
return;
289-
} else if (result == eventMergeIndexB)
290-
{
291-
merger->mergeEventsB = !merger->mergeEventsB;
292-
CoreServices::updateSignalChain(this);
293-
return;
294272
} else if (result == continuousMergeIndexB)
295273
{
296274
merger->mergeContinuousB = !merger->mergeContinuousB;

0 commit comments

Comments
 (0)