diff --git a/Source/Processors/Editors/GenericEditor.cpp b/Source/Processors/Editors/GenericEditor.cpp index 28f5f8bcf739e8cc683d5cad6f2313ad55e36983..031ea461317f3a547d2a7a0bdeb4967e233f699e 100755 --- a/Source/Processors/Editors/GenericEditor.cpp +++ b/Source/Processors/Editors/GenericEditor.cpp @@ -90,7 +90,10 @@ void GenericEditor::constructorInitialize(GenericProcessor* owner, bool useDefau addChildComponent(channelSelector); channelSelector->setVisible(false); - + isSplitOrMerge=false; + } + else{ + isSplitOrMerge=true; } backgroundGradient = ColourGradient(Colour(190, 190, 190), 0.0f, 0.0f, @@ -475,10 +478,17 @@ bool GenericEditor::getAudioStatus(int chan) void GenericEditor::getChannelSelectionState(int chan, bool* p, bool* r, bool* a) { - - *p = channelSelector->getParamStatus(chan); - *r = channelSelector->getRecordStatus(chan); - *a = channelSelector->getAudioStatus(chan); + if (!isSplitOrMerge) + { + *p = channelSelector->getParamStatus(chan); + *r = channelSelector->getRecordStatus(chan); + *a = channelSelector->getAudioStatus(chan); + } + else{ + *p = FALSE; + *r = FALSE; + *a = FALSE; + } } void GenericEditor::setChannelSelectionState(int chan, bool p, bool r, bool a) diff --git a/Source/Processors/Editors/GenericEditor.h b/Source/Processors/Editors/GenericEditor.h index c8c59178b25dcf4e1c310ff5869d924bd6bdf9a1..762b9bc3f6593b28128c43f18c16d3516c1c609f 100755 --- a/Source/Processors/Editors/GenericEditor.h +++ b/Source/Processors/Editors/GenericEditor.h @@ -275,6 +275,8 @@ private: bool isSelected; bool isEnabled; + /**Used to determine if an editor is a splitter or Merger to avoid calling on CHannelSelector*/ + bool isSplitOrMerge; int tNum;