From dcfeef471250e2dfb6d320a1a6646584c59d765b Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 7 Nov 2014 00:24:37 +0100 Subject: [PATCH] Reference and comments --- interface/src/Audio.cpp | 3 ++- interface/src/Audio.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 6129ee4ee0..79ebcdd043 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -587,8 +587,9 @@ void Audio::addReverb(int16_t* samplesData, int numSamples, QAudioFormat& audioF } } -void Audio::handleLocalEchoAndReverb(QByteArray inputByteArray) { +void Audio::handleLocalEchoAndReverb(QByteArray& inputByteArray) { bool hasEcho = Menu::getInstance()->isOptionChecked(MenuOption::EchoLocalAudio); + // If there is server echo, reverb will be applied to the recieved audio stream so no need to have it here. bool hasLocalReverb = (_reverb || _receivedAudioStream.hasReverb()) && !Menu::getInstance()->isOptionChecked(MenuOption::EchoServerAudio); if (_muted || !_audioOutput || (!hasEcho && !hasLocalReverb)) { diff --git a/interface/src/Audio.h b/interface/src/Audio.h index e58afa306f..be51511dcc 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -273,7 +273,7 @@ private: void updateGverbOptions(); void addReverb(int16_t* samples, int numSamples, QAudioFormat& format); - void handleLocalEchoAndReverb(QByteArray inputByteArray); + void handleLocalEchoAndReverb(QByteArray& inputByteArray); // Add sounds that we want the user to not hear themselves, by adding on top of mic input signal void addProceduralSounds(int16_t* monoInput, int numSamples);