summaryrefslogtreecommitdiffstats
path: root/src/engine/effects
diff options
context:
space:
mode:
authorbe_ <be.0@gmx.com>2017-12-16 18:05:47 -0600
committerbe_ <be.0@gmx.com>2017-12-16 18:05:47 -0600
commit04cbfcf63e8f120cbe7fe188825326cd38fccd90 (patch)
tree24e952d40c102a1145ff1a10b92ac3df135bd8ab /src/engine/effects
parentbe3fd5e0e2c055f0498808917f6bd9bbdb494aa1 (diff)
move pEffectStatesMapArray into the EffectsRequest union
Diffstat (limited to 'src/engine/effects')
-rw-r--r--src/engine/effects/engineeffectchain.cpp2
-rw-r--r--src/engine/effects/message.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/effects/engineeffectchain.cpp b/src/engine/effects/engineeffectchain.cpp
index 8722ca1276..c75ac75e3e 100644
--- a/src/engine/effects/engineeffectchain.cpp
+++ b/src/engine/effects/engineeffectchain.cpp
@@ -125,7 +125,7 @@ bool EngineEffectChain::processEffectsRequest(EffectsRequest& message,
<< message.channel;
}
response.success = enableForInputChannel(message.channel,
- std::move(message.pEffectStatesMapArray));
+ message.EnableInputChannelForChain.pEffectStatesMapArray);
break;
case EffectsRequest::DISABLE_EFFECT_CHAIN_FOR_INPUT_CHANNEL:
if (kEffectDebugOutput) {
diff --git a/src/engine/effects/message.h b/src/engine/effects/message.h
index db3027c4d8..8c4c3d3eab 100644
--- a/src/engine/effects/message.h
+++ b/src/engine/effects/message.h
@@ -107,6 +107,9 @@ struct EffectsRequest {
int iIndex;
} RemoveChainFromRack;
struct {
+ EffectStatesMapArray* pEffectStatesMapArray;
+ } EnableInputChannelForChain;
+ struct {
EngineEffect* pEffect;
int iIndex;
} AddEffectToChain;
@@ -135,9 +138,6 @@ struct EffectsRequest {
// DISABLE_EFFECT_CHAIN_FOR_INPUT_CHANNEL.
ChannelHandle channel;
- // Used by ENABLE_EFFECT_CHAIN_FOR_INPUT_CHANNEL
- EffectStatesMapArray* pEffectStatesMapArray;
-
// Used by SET_EFFECT_PARAMETER.
double minimum;
double maximum;