From e07f53d022e9889e17bd40aa5df4251a86da3641 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Thu, 20 Nov 2014 19:57:24 -0600 Subject: [PATCH] remove unused test audio filters --- interface/src/Audio.cpp | 35 +---------------------------------- interface/src/Audio.h | 10 ---------- interface/src/Menu.cpp | 41 ----------------------------------------- interface/src/Menu.h | 5 ----- 4 files changed, 1 insertion(+), 90 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index af11b4922c..75b8c252f7 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -115,7 +115,6 @@ Audio::Audio(QObject* parent) : _samplesPerScope(NETWORK_SAMPLES_PER_FRAME * _framesPerScope), _noiseSourceEnabled(false), _toneSourceEnabled(true), - _peqEnabled(false), _scopeInput(0), _scopeOutputLeft(0), _scopeOutputRight(0), @@ -153,7 +152,6 @@ void Audio::init(QGLWidget *parent) { void Audio::reset() { _receivedAudioStream.reset(); resetStats(); - _peq.reset(); _noiseSource.reset(); _toneSource.reset(); _sourceGain.reset(); @@ -457,7 +455,6 @@ void Audio::start() { } _inputFrameBuffer.initialize( _inputFormat.channelCount(), _audioInput->bufferSize() * 8 ); - _peq.initialize( _inputFormat.sampleRate() ); _inputGain.initialize(); _sourceGain.initialize(); _noiseSource.initialize(); @@ -469,7 +466,6 @@ void Audio::start() { void Audio::stop() { _inputFrameBuffer.finalize(); - _peq.finalize(); _inputGain.finalize(); _sourceGain.finalize(); _noiseSource.finalize(); @@ -664,7 +660,7 @@ void Audio::handleAudioInput() { QByteArray inputByteArray = _inputDevice->readAll(); - if (!_muted && (_audioSourceInjectEnabled || _peqEnabled)) { + if (!_muted && _audioSourceInjectEnabled) { int16_t* inputFrameData = (int16_t*)inputByteArray.data(); const uint32_t inputFrameCount = inputByteArray.size() / sizeof(int16_t); @@ -685,10 +681,6 @@ void Audio::handleAudioInput() { } _sourceGain.render(_inputFrameBuffer); // post gain } - if (_peqEnabled) { - _peq.render(_inputFrameBuffer); // 3-band parametric eq - } - _inputFrameBuffer.copyFrames(1, inputFrameCount, inputFrameData, true /*copy out*/); } @@ -1473,31 +1465,6 @@ void Audio::renderToolBox(int x, int y, bool boxed) { glDisable(GL_TEXTURE_2D); } -void Audio::toggleAudioFilter() { - _peqEnabled = !_peqEnabled; -} - -void Audio::selectAudioFilterFlat() { - if (Menu::getInstance()->isOptionChecked(MenuOption::AudioFilterFlat)) { - _peq.loadProfile(0); - } -} -void Audio::selectAudioFilterTrebleCut() { - if (Menu::getInstance()->isOptionChecked(MenuOption::AudioFilterTrebleCut)) { - _peq.loadProfile(1); - } -} -void Audio::selectAudioFilterBassCut() { - if (Menu::getInstance()->isOptionChecked(MenuOption::AudioFilterBassCut)) { - _peq.loadProfile(2); - } -} -void Audio::selectAudioFilterSmiley() { - if (Menu::getInstance()->isOptionChecked(MenuOption::AudioFilterSmiley)) { - _peq.loadProfile(3); - } -} - void Audio::toggleScope() { _scopeEnabled = !_scopeEnabled; if (_scopeEnabled) { diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 65db32b723..0f92dc7258 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -26,8 +26,6 @@ #include "AudioSourceTone.h" #include "AudioSourceNoise.h" #include "AudioGain.h" -#include "AudioFilter.h" -#include "AudioFilterBank.h" #include #include @@ -149,11 +147,6 @@ public slots: void addLastFrameRepeatedWithFadeToScope(int samplesPerChannel); void addStereoSamplesToScope(const QByteArray& samples); void processReceivedSamples(const QByteArray& inputBuffer, QByteArray& outputBuffer); - void toggleAudioFilter(); - void selectAudioFilterFlat(); - void selectAudioFilterTrebleCut(); - void selectAudioFilterBassCut(); - void selectAudioFilterSmiley(); virtual bool outputLocalInjector(bool isStereo, qreal volume, AudioInjector* injector); @@ -332,9 +325,6 @@ private: bool _toneSourceEnabled; AudioSourceTone _toneSource; - // Multi-band parametric EQ - bool _peqEnabled; - AudioFilterPEQ3m _peq; QMutex _guard; QByteArray* _scopeInput; diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index ff34c0200c..8cc075fed1 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -545,47 +545,6 @@ Menu::Menu() : appInstance->getAudio(), SLOT(toggleAudioNoiseReduction())); - addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioFilter, - 0, - false, - appInstance->getAudio(), - SLOT(toggleAudioFilter())); - - QMenu* audioFilterMenu = audioDebugMenu->addMenu("Audio Filter"); - addDisabledActionAndSeparator(audioFilterMenu, "Filter Response"); - { - QAction *flat = addCheckableActionToQMenuAndActionHash(audioFilterMenu, MenuOption::AudioFilterFlat, - 0, - true, - appInstance->getAudio(), - SLOT(selectAudioFilterFlat())); - - QAction *trebleCut = addCheckableActionToQMenuAndActionHash(audioFilterMenu, MenuOption::AudioFilterTrebleCut, - 0, - false, - appInstance->getAudio(), - SLOT(selectAudioFilterTrebleCut())); - - QAction *bassCut = addCheckableActionToQMenuAndActionHash(audioFilterMenu, MenuOption::AudioFilterBassCut, - 0, - false, - appInstance->getAudio(), - SLOT(selectAudioFilterBassCut())); - - QAction *smiley = addCheckableActionToQMenuAndActionHash(audioFilterMenu, MenuOption::AudioFilterSmiley, - 0, - false, - appInstance->getAudio(), - SLOT(selectAudioFilterSmiley())); - - - QActionGroup* audioFilterGroup = new QActionGroup(audioFilterMenu); - audioFilterGroup->addAction(flat); - audioFilterGroup->addAction(trebleCut); - audioFilterGroup->addAction(bassCut); - audioFilterGroup->addAction(smiley); - } - addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio); addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio); addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::StereoAudio, 0, false, diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 2f5ccc533c..17b29996a8 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -332,11 +332,6 @@ namespace MenuOption { const QString Animations = "Animations..."; const QString Atmosphere = "Atmosphere"; const QString Attachments = "Attachments..."; - const QString AudioFilter = "Audio Filter Bank"; - const QString AudioFilterFlat = "Flat Response"; - const QString AudioFilterTrebleCut= "Treble Cut"; - const QString AudioFilterBassCut = "Bass Cut"; - const QString AudioFilterSmiley = "Smiley Curve"; const QString AudioNoiseReduction = "Audio Noise Reduction"; const QString AudioScope = "Show Scope"; const QString AudioScopeFiftyFrames = "Fifty";