Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restored addReverb default arg

Browse source
This commit is contained in:
Atlante45 2015-01-06 16:35:30 -08:00
parent fb6fb8a38d
commit 29839df9fe
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Audio.cpp
View file

@ -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 wetFraction = DB_CO(_reverbOptions->getWetLevel());
float dryFraction = (!_shouldEchoLocally) ? 0.0f : (1.0f - wetFraction); float dryFraction = (noEcho) ? 0.0f : (1.0f - wetFraction);
float lValue,rValue; float lValue,rValue;
for (int sample = 0; sample < numSamples; sample += audioFormat.channelCount()) { for (int sample = 0; sample < numSamples; sample += audioFormat.channelCount()) {
@ -568,7 +568,7 @@ void Audio::handleLocalEchoAndReverb(QByteArray& inputByteArray) {
int16_t* loopbackSamples = reinterpret_cast<int16_t*>(loopBackByteArray.data()); int16_t* loopbackSamples = reinterpret_cast<int16_t*>(loopBackByteArray.data());
int numLoopbackSamples = loopBackByteArray.size() / sizeof(int16_t); int numLoopbackSamples = loopBackByteArray.size() / sizeof(int16_t);
updateGverbOptions(); updateGverbOptions();
addReverb(_gverbLocal, loopbackSamples, numLoopbackSamples, _outputFormat); addReverb(_gverbLocal, loopbackSamples, numLoopbackSamples, _outputFormat, !_shouldEchoLocally);
} }
if (_loopbackOutputDevice) { if (_loopbackOutputDevice) {

2
interface/src/Audio.h
View file

@ -208,7 +208,7 @@ private:
// Adds Reverb // Adds Reverb
void initGverb(); void initGverb();
void updateGverbOptions(); 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); void handleLocalEchoAndReverb(QByteArray& inputByteArray);