From c75662200446820f43dec96e2d6e7e88a765c7ee Mon Sep 17 00:00:00 2001 From: Andre Weissflog Date: Tue, 3 Apr 2018 22:45:44 +0200 Subject: [PATCH] Audio: remove the soloud lowpass filter --- src/yakc_oryol/Audio.cc | 17 ----------------- src/yakc_oryol/Audio.h | 9 --------- src/yakc_ui/UI.cc | 7 ------- 3 files changed, 33 deletions(-) diff --git a/src/yakc_oryol/Audio.cc b/src/yakc_oryol/Audio.cc index 9648eba..3cc493e 100644 --- a/src/yakc_oryol/Audio.cc +++ b/src/yakc_oryol/Audio.cc @@ -21,11 +21,9 @@ Audio::Setup(yakc* emu_) { soloud->init(SoLoud::Soloud::CLIP_ROUNDOFF, SoLoud::Soloud::AUTO, 44100, 1024, 1); } soloud_open_count++; - this->filter.setParams(SoLoud::BiquadResonantFilter::LOWPASS, 44100, this->LowPassFreq, this->LowPassResonance); this->audioSource = Memory::New(); this->audioSource->emu = emu_; this->audioSource->setSingleInstance(true); - this->audioSource->setFilter(0, &this->filter); this->audioSource->cpu_clock_speed = board.freq_hz; this->audioHandle = soloud->play(*this->audioSource, 1.0f); } @@ -56,20 +54,5 @@ Audio::GetProcessedCycles() const { return this->audioSource->sample_cycle_count; } -//------------------------------------------------------------------------------ -void -Audio::UpdateFilterSettings() { - soloud->fadeFilterParameter(this->audioHandle, 0, SoLoud::BiquadResonantFilter::FREQUENCY, this->LowPassFreq, 0.1f); - soloud->fadeFilterParameter(this->audioHandle, 0, SoLoud::BiquadResonantFilter::RESONANCE, this->LowPassResonance, 0.1f); -} - -//------------------------------------------------------------------------------ -void -Audio::ResetFilterSettings() { - this->LowPassFreq = 4000.0f; - this->LowPassResonance = 2.0f; - this->UpdateFilterSettings(); -} - } // namespace YAKC diff --git a/src/yakc_oryol/Audio.h b/src/yakc_oryol/Audio.h index 42f6b08..c2b209e 100644 --- a/src/yakc_oryol/Audio.h +++ b/src/yakc_oryol/Audio.h @@ -7,7 +7,6 @@ #include "yakc/yakc.h" #include "Core/Containers/Queue.h" #include "AudioSource.h" -#include "soloud_biquadresonantfilter.h" namespace YAKC { @@ -21,18 +20,10 @@ class Audio { void Update(); /// get the current max processed audio sample count in number of CPU cycles uint64_t GetProcessedCycles() const; - /// update filter settings - void UpdateFilterSettings(); - /// reset filter settings to default - void ResetFilterSettings(); - - float LowPassFreq = 3200.0f; - float LowPassResonance = 2.0f; static SoLoud::Soloud* soloud; static int soloud_open_count; yakc* emu = nullptr; - SoLoud::BiquadResonantFilter filter; AudioSource* audioSource = nullptr; int audioHandle = 0; }; diff --git a/src/yakc_ui/UI.cc b/src/yakc_ui/UI.cc index 6269d66..a7fb819 100644 --- a/src/yakc_ui/UI.cc +++ b/src/yakc_ui/UI.cc @@ -446,16 +446,9 @@ UI::OnFrame(yakc& emu) { this->Settings.colorTV = !this->Settings.colorTV; } ImGui::SliderFloat("CRT Warp", &this->Settings.crtWarp, 0.0f, 1.0f/16.0f); - if (ImGui::SliderFloat("Lowpass Freq", &this->audio->LowPassFreq, 1000.0, 8000.0f)) { - this->audio->UpdateFilterSettings(); - } - if (ImGui::SliderFloat("Lowpass Resonance", &this->audio->LowPassResonance, 1.0f, 8.0f)) { - this->audio->UpdateFilterSettings(); - } ImGui::SliderInt("CPU Speed", &emu.accel, 1, 8, "%.0fx"); if (ImGui::MenuItem("Reset To Defaults")) { this->Settings = settings(); - this->audio->ResetFilterSettings(); } ImGui::EndMenu(); }