From 29839df9fe86902bee1a83ab832905605e057ae8 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 6 Jan 2015 16:35:30 -0800 Subject: [PATCH] Restored addReverb default arg --- interface/src/Audio.cpp | 6 +++--- interface/src/Audio.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 045a3d42fb..d9d0972c84 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -507,9 +507,9 @@ void Audio::setReverbOptions(const AudioEffectOptions* options) { } } -void Audio::addReverb(ty_gverb* gverb, int16_t* samplesData, int numSamples, QAudioFormat& audioFormat) { +void Audio::addReverb(ty_gverb* gverb, int16_t* samplesData, int numSamples, QAudioFormat& audioFormat, bool noEcho) { float wetFraction = DB_CO(_reverbOptions->getWetLevel()); - float dryFraction = (!_shouldEchoLocally) ? 0.0f : (1.0f - wetFraction); + float dryFraction = (noEcho) ? 0.0f : (1.0f - wetFraction); float lValue,rValue; for (int sample = 0; sample < numSamples; sample += audioFormat.channelCount()) { @@ -568,7 +568,7 @@ void Audio::handleLocalEchoAndReverb(QByteArray& inputByteArray) { int16_t* loopbackSamples = reinterpret_cast(loopBackByteArray.data()); int numLoopbackSamples = loopBackByteArray.size() / sizeof(int16_t); updateGverbOptions(); - addReverb(_gverbLocal, loopbackSamples, numLoopbackSamples, _outputFormat); + addReverb(_gverbLocal, loopbackSamples, numLoopbackSamples, _outputFormat, !_shouldEchoLocally); } if (_loopbackOutputDevice) { diff --git a/interface/src/Audio.h b/interface/src/Audio.h index be0e86e0af..e4c02c2827 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -208,7 +208,7 @@ private: // Adds Reverb void initGverb(); void updateGverbOptions(); - void addReverb(ty_gverb* gverb, int16_t* samples, int numSamples, QAudioFormat& format); + void addReverb(ty_gverb* gverb, int16_t* samples, int numSamples, QAudioFormat& format, bool noEcho = false); void handleLocalEchoAndReverb(QByteArray& inputByteArray);