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

Remove _gverbLocal

Browse source
This commit is contained in:
Atlante45 2015-02-16 16:15:03 +01:00
parent b59aaf8a0f
commit f279030283
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/audio-client/src/AudioClient.cpp
View file

@ -104,7 +104,6 @@ AudioClient::AudioClient() :
_audioSourceInjectEnabled(false), _audioSourceInjectEnabled(false),
_reverb(false), _reverb(false),
_reverbOptions(&_scriptReverbOptions), _reverbOptions(&_scriptReverbOptions),
_gverbLocal(NULL),
_gverb(NULL), _gverb(NULL),
_inputToNetworkResampler(NULL), _inputToNetworkResampler(NULL),
_networkToOutputResampler(NULL), _networkToOutputResampler(NULL),
@ -130,20 +129,14 @@ AudioClient::AudioClient() :
connect(updateTimer, &QTimer::timeout, this, &AudioClient::checkDevices); connect(updateTimer, &QTimer::timeout, this, &AudioClient::checkDevices);
updateTimer->start(DEVICE_CHECK_INTERVAL_MSECS); updateTimer->start(DEVICE_CHECK_INTERVAL_MSECS);
// create GVerb filters // create GVerb filter
_gverb = createGverbFilter(); _gverb = createGverbFilter();
_gverbLocal = createGverbFilter();
// configure filters
configureGverbFilter(_gverb); configureGverbFilter(_gverb);
configureGverbFilter(_gverbLocal);
} }
AudioClient::~AudioClient() { AudioClient::~AudioClient() {
stop(); stop();
if (_gverbLocal) {
gverb_free(_gverbLocal);
}
if (_gverb) { if (_gverb) {
gverb_free(_gverb); gverb_free(_gverb);
} }
@ -158,7 +151,6 @@ void AudioClient::reset() {
_inputGain.reset(); _inputGain.reset();
gverb_flush(_gverb); gverb_flush(_gverb);
gverb_flush(_gverbLocal);
} }
void AudioClient::audioMixerKilled() { void AudioClient::audioMixerKilled() {
@ -582,9 +574,6 @@ void AudioClient::updateGverbOptions() {
gverb_free(_gverb); gverb_free(_gverb);
_gverb = createGverbFilter(); _gverb = createGverbFilter();
configureGverbFilter(_gverb); configureGverbFilter(_gverb);
gverb_free(_gverbLocal);
_gverbLocal = createGverbFilter();
configureGverbFilter(_gverbLocal);
} }
} }
@ -593,7 +582,6 @@ void AudioClient::setReverb(bool reverb) {
if (!_reverb) { if (!_reverb) {
gverb_flush(_gverb); gverb_flush(_gverb);
gverb_flush(_gverbLocal);
} }
} }
@ -616,9 +604,6 @@ void AudioClient::setReverbOptions(const AudioEffectOptions* options) {
gverb_free(_gverb); gverb_free(_gverb);
_gverb = createGverbFilter(); _gverb = createGverbFilter();
configureGverbFilter(_gverb); configureGverbFilter(_gverb);
gverb_free(_gverbLocal);
_gverbLocal = createGverbFilter();
configureGverbFilter(_gverbLocal);
} }
} }
@ -694,7 +679,7 @@ void AudioClient::handleLocalEchoAndReverb(QByteArray& inputByteArray) {
if (hasReverb) { if (hasReverb) {
updateGverbOptions(); updateGverbOptions();
addReverb(_gverbLocal, inputSamples, reverbAloneSamples, numInputSamples, addReverb(_gverb, inputSamples, reverbAloneSamples, numInputSamples,
_outputFormat, !_shouldEchoLocally); _outputFormat, !_shouldEchoLocally);
} }

1
libraries/audio-client/src/AudioClient.h
View file

@ -243,7 +243,6 @@ private:
AudioEffectOptions _scriptReverbOptions; AudioEffectOptions _scriptReverbOptions;
AudioEffectOptions _zoneReverbOptions; AudioEffectOptions _zoneReverbOptions;
AudioEffectOptions* _reverbOptions; AudioEffectOptions* _reverbOptions;
ty_gverb* _gverbLocal;
ty_gverb* _gverb; ty_gverb* _gverb;
// possible soxr streams needed for resample // possible soxr streams needed for resample