e1lama/SeeSynth
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

refactor: move around some code

Browse Source
This commit is contained in:
HiveBeats
2023-09-10 01:13:25 +04:00
parent de37b814bf
commit d7dd36ccd1
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/FilterFactory.h
View File

@@ -22,4 +22,8 @@ struct FilterFactory {
} }
return newFilter; return newFilter;
} }
static Filter* GetDefaultFilter() {
return new LowPassFilter();
}
}; };

5
src/Filter.cpp
View File

@@ -15,6 +15,7 @@ void Filter::Trigger() {}
void Filter::Release() {} void Filter::Release() {}
float Filter::Process(float in) { float Filter::Process(float in) {
// may move to a compile-time dictionary calculation, if needed
calculate_coefficients(); calculate_coefficients();
float out = in * m_a0 + m_z1; float out = in * m_a0 + m_z1;
m_z1 = in * m_a1 + m_z2 - m_b1 * out; m_z1 = in * m_a1 + m_z2 - m_b1 * out;
@@ -23,10 +24,6 @@ float Filter::Process(float in) {
} }
void Filter::Process(std::vector<float>& samples) { void Filter::Process(std::vector<float>& samples) {
// todo: that will not work for ADSR-controlled filter. So, let's calculate
// all the possible frequency values into array/dictionary then just lookup
// for each sample
for (std::size_t i = 0; i < samples.size(); i++) { for (std::size_t i = 0; i < samples.size(); i++) {
samples[i] = Process(samples[i]); samples[i] = Process(samples[i]);
} }

5
src/Renderer.cpp
View File

@@ -241,13 +241,8 @@ float Renderer::draw_filter_panel(Synth& synth, FilterGuiState& gui_filter,
gui_filter.is_dropdown_open = !gui_filter.is_dropdown_open; gui_filter.is_dropdown_open = !gui_filter.is_dropdown_open;
gui_filter.type = (FilterType)(shape_index); gui_filter.type = (FilterType)(shape_index);
// APPLY STATE TO REAL SYNTH // APPLY STATE TO REAL SYNTH
if (!filter->IsSameFilterType(gui_filter.type)) {
synth.SetFilter(gui_filter.type); synth.SetFilter(gui_filter.type);
} }
//filter.SetType(ui_osc->waveshape);
}
// if (gui_filter.is_dropdown_open)
// break;
// apply values to real one // apply values to real one
// todo: thrid (order) parameter // todo: thrid (order) parameter

5
src/Synth.cpp
View File

@@ -3,7 +3,6 @@
#include "Logger.h" #include "Logger.h"
#include "OscillatorType.h" #include "OscillatorType.h"
#include "Settings.h" #include "Settings.h"
#include "LowPassFilter.h"
#include "FilterFactory.h" #include "FilterFactory.h"
Synth::Synth(/* args */) { Synth::Synth(/* args */) {
@@ -11,7 +10,7 @@ Synth::Synth(/* args */) {
add_oscillator(); add_oscillator();
add_oscillator(); add_oscillator();
AddEffect(new ADSR()); AddEffect(new ADSR());
AddEffect(new LowPassFilter()); AddEffect(FilterFactory::GetDefaultFilter());
for (size_t i = 0; i < STREAM_BUFFER_SIZE; i++) { for (size_t i = 0; i < STREAM_BUFFER_SIZE; i++) {
float sample = 0.0f; float sample = 0.0f;
m_out_signal.push_back(sample); m_out_signal.push_back(sample);
@@ -98,7 +97,9 @@ void Synth::AddEffect(Effect* fx) { m_effects.push_back(fx); }
void Synth::SetFilter(FilterType type) { void Synth::SetFilter(FilterType type) {
Filter* oldFilter = this->GetFilter(); Filter* oldFilter = this->GetFilter();
if (!oldFilter->IsSameFilterType(type)) {
Filter* newFilter = FilterFactory::CreateFilter(oldFilter, type); Filter* newFilter = FilterFactory::CreateFilter(oldFilter, type);
delete oldFilter; delete oldFilter;
m_effects[1] = newFilter; m_effects[1] = newFilter;
}
} }