diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-29 20:32:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-29 20:32:49 +0100 |
commit | 98c1be60161a2cb277c40a8a79800442ef69bb3f (patch) | |
tree | 28cfab674d4b71fd6a92ed17c7b7b7a7c2349758 /src/engine/enginemaster.cpp | |
parent | 12a083e2a58e620e7d67545231076bc97df64657 (diff) | |
parent | 9e2dac6bf5bdf2795a47abbfe12d750089da6e78 (diff) |
Merge pull request #1753 from daschuer/lp1782568
Fix broken Mic mute button (used in Deere) and ...
Diffstat (limited to 'src/engine/enginemaster.cpp')
-rw-r--r-- | src/engine/enginemaster.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/enginemaster.cpp b/src/engine/enginemaster.cpp index 721dc07f4a..5454723c90 100644 --- a/src/engine/enginemaster.cpp +++ b/src/engine/enginemaster.cpp @@ -289,7 +289,8 @@ void EngineMaster::processChannels(int iBufferSize) { continue; } - if (pChannel->isTalkoverEnabled()) { + if (pChannel->isTalkoverEnabled() && + !pChannelInfo->m_pMuteControl->toBool()) { // talkover is an exclusive channel // once talkover is enabled it is not used in // xFader-Mix @@ -449,10 +450,10 @@ void EngineMaster::process(const int iBufferSize) { // Mix all the talkover enabled channels together. // Effects processing is done in place to avoid unnecessary buffer copying. ChannelMixer::applyEffectsInPlaceAndMixChannels( - m_talkoverGain, &m_activeTalkoverChannels, - &m_channelTalkoverGainCache, - m_pTalkover, m_masterHandle.handle(), - m_iBufferSize, m_iSampleRate, m_pEngineEffectsManager); + m_talkoverGain, &m_activeTalkoverChannels, + &m_channelTalkoverGainCache, + m_pTalkover, m_masterHandle.handle(), + m_iBufferSize, m_iSampleRate, m_pEngineEffectsManager); // Process effects on all microphones mixed together // We have no metadata for mixed effect buses, so use an empty GroupFeatureState. |