fix: apply format

This commit is contained in:
2023-09-05 03:15:08 +04:00
parent 564955c911
commit de31b73673
11 changed files with 77 additions and 88 deletions

View File

@@ -1,7 +1,7 @@
#pragma once
#include "Effect.h"
#include <cstddef>
#include "Ramp.h"
#include <cstddef>
struct ADSRParameters {
float attack_time; // Attack time in seconds
@@ -16,20 +16,21 @@ class ADSR : public Effect {
private:
ADSRParameters m_parameters;
ADSRState m_state;
Ramp *m_ramp;
Ramp* m_ramp;
void process_sample(float* sample);
bool is_attack_elapsed();
bool is_decay_elapsed();
bool is_release_elapsed();
void recheck_state();
public:
ADSR(/* args */);
ADSR(ADSRParameters param);
~ADSR();
void OnSetNote() override;
void OnUnsetNote() override;
//void RetriggerState() override;
// void RetriggerState() override;
void Process(std::vector<float>& samples) override;
void Reset();
};

View File

@@ -6,13 +6,13 @@
#include <vector>
struct Adder {
static void
SumOscillators(const std::vector<Oscillator*>& oscillators,
std::vector<float>& signal) {
size_t sample_count = STREAM_BUFFER_SIZE;//(size_t)(1.f/FPS * SAMPLE_RATE);
static void SumOscillators(const std::vector<Oscillator*>& oscillators,
std::vector<float>& signal) {
size_t sample_count =
STREAM_BUFFER_SIZE; //(size_t)(1.f/FPS * SAMPLE_RATE);
//std::vector<float>* output = new std::vector<float>();
//output->reserve(sample_count);
// std::vector<float>* output = new std::vector<float>();
// output->reserve(sample_count);
for (size_t i = 0; i < sample_count; i++) {
float sample = 0.0f;

View File

@@ -8,6 +8,6 @@ class Effect {
~Effect(){};
virtual void OnSetNote(){};
virtual void OnUnsetNote(){};
//virtual void RetriggerState(){};
// virtual void RetriggerState(){};
virtual void Process(std::vector<float>& samples){};
};

View File

@@ -1,17 +1,16 @@
#pragma once
class Ramp
{
private:
class Ramp {
private:
float m_level;
float m_sample_rate;
float m_increment;
int m_counter;
public:
public:
Ramp(float starting_level, float sample_rate);
~Ramp();
void RampTo(float value, float time);
float Process();
bool IsCompleted();
};

View File

@@ -8,7 +8,7 @@ class Renderer {
private:
void draw_main_panel(const Rectangle& panel_bounds);
void draw_add_oscillator_button(Synth& synth, SynthGuiState& synth_gui,
Rectangle panel_bounds);
Rectangle panel_bounds);
void draw_oscillators_panels(
const std::vector<Oscillator*>& oscillators,
const std::vector<OscillatorGuiState*>& gui_oscillators,

View File

@@ -2,7 +2,7 @@
#define SAMPLE_RATE 44100.f
#define BPM 120.f
#define BEAT_DURATION 60.f/BPM
#define BEAT_DURATION 60.f / BPM
#define PITCH_STANDARD 440.f
#define VOLUME 0.5f
#define ATTACK_MS 100.f