1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Properly ifdef filteraudio usage

This commit is contained in:
tux3 2016-01-25 16:35:45 +01:00
parent 9251f1f4ca
commit c82e41ff6f
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -84,7 +84,9 @@ Audio::~Audio()
audioThread->wait(); audioThread->wait();
cleanupInput(); cleanupInput();
cleanupOutput(); cleanupOutput();
#ifdef QTOX_FILTER_AUDIO
filterer.closeFilter(); filterer.closeFilter();
#endif
} }
void Audio::checkAlError() noexcept void Audio::checkAlError() noexcept
@ -487,6 +489,7 @@ void Audio::doCapture()
int16_t buf[AUDIO_FRAME_SAMPLE_COUNT * AUDIO_CHANNELS]; int16_t buf[AUDIO_FRAME_SAMPLE_COUNT * AUDIO_CHANNELS];
alcCaptureSamples(alInDev, buf, AUDIO_FRAME_SAMPLE_COUNT); alcCaptureSamples(alInDev, buf, AUDIO_FRAME_SAMPLE_COUNT);
#ifdef QTOX_FILTER_AUDIO
if (Settings::getInstance().getFilterAudio()) if (Settings::getInstance().getFilterAudio())
{ {
#ifdef ALC_LOOPBACK_CAPTURE_SAMPLES #ifdef ALC_LOOPBACK_CAPTURE_SAMPLES
@ -495,6 +498,7 @@ void Audio::doCapture()
#endif #endif
filterer.filterAudio(buf, AUDIO_FRAME_SAMPLE_COUNT * AUDIO_CHANNELS); filterer.filterAudio(buf, AUDIO_FRAME_SAMPLE_COUNT * AUDIO_CHANNELS);
} }
#endif
for (size_t i = 0; i < AUDIO_FRAME_SAMPLE_COUNT * AUDIO_CHANNELS; ++i) for (size_t i = 0; i < AUDIO_FRAME_SAMPLE_COUNT * AUDIO_CHANNELS; ++i)
buf[i] *= inGain; buf[i] *= inGain;