formatting
This commit is contained in:
@@ -1,15 +1,15 @@
|
||||
#pragma once
|
||||
#include "tx_sineosc.h"
|
||||
#include "../util/audio_math.h"
|
||||
#include "ivoice.h"
|
||||
#include "tx_envelope.h"
|
||||
#include "tx_operator.h"
|
||||
#include "ivoice.h"
|
||||
#include "../util/audio_math.h"
|
||||
#include "tx_sineosc.h"
|
||||
|
||||
namespace trnr {
|
||||
|
||||
class tx_voice : public ivoice {
|
||||
public:
|
||||
tx_voice()
|
||||
tx_voice()
|
||||
: algorithm { 0 }
|
||||
, pitch_env_amt { 0.f }
|
||||
, feedback_amt { 0.f }
|
||||
@@ -33,23 +33,27 @@ public:
|
||||
tx_operator op2;
|
||||
tx_operator op3;
|
||||
|
||||
void note_on(int _note, float _velocity) override {
|
||||
void note_on(int _note, float _velocity) override
|
||||
{
|
||||
this->gate = true;
|
||||
this->trigger = true;
|
||||
midi_note = _note;
|
||||
velocity = _velocity;
|
||||
}
|
||||
|
||||
void note_off() override {
|
||||
void note_off() override
|
||||
{
|
||||
this->gate = false;
|
||||
}
|
||||
|
||||
// modulates the pitch in semitones
|
||||
void modulate_pitch(float _pitch) override {
|
||||
void modulate_pitch(float _pitch) override
|
||||
{
|
||||
this->pitch_mod = _pitch;
|
||||
}
|
||||
|
||||
float process_sample() override {
|
||||
float process_sample() override
|
||||
{
|
||||
float pitch_env_signal = pitch_env.process_sample(gate, trigger) * pitch_env_amt;
|
||||
float pitched_freq = midi_to_frequency(midi_note + pitch_mod + additional_pitch_mod) + pitch_env_signal;
|
||||
|
||||
@@ -82,7 +86,8 @@ public:
|
||||
|
||||
bool is_busy() override { return gate || op1.envelope.is_busy() || op2.envelope.is_busy() || op3.envelope.is_busy(); }
|
||||
|
||||
void set_samplerate(double samplerate) override {
|
||||
void set_samplerate(double samplerate) override
|
||||
{
|
||||
pitch_env.set_samplerate(samplerate);
|
||||
feedback_osc.set_samplerate(samplerate);
|
||||
op1.set_samplerate(samplerate);
|
||||
@@ -90,7 +95,8 @@ public:
|
||||
op3.set_samplerate(samplerate);
|
||||
}
|
||||
|
||||
void set_phase_reset(bool phase_reset) {
|
||||
void set_phase_reset(bool phase_reset)
|
||||
{
|
||||
op1.oscillator.phase_reset = phase_reset;
|
||||
op2.oscillator.phase_reset = phase_reset;
|
||||
op3.oscillator.phase_reset = phase_reset;
|
||||
@@ -101,7 +107,8 @@ private:
|
||||
const float MOD_INDEX_COEFF = 4.f;
|
||||
float pitch_mod = 0.f; // modulates pitch in semi-tones
|
||||
|
||||
float calc_algo1(const float frequency) {
|
||||
float calc_algo1(const float frequency)
|
||||
{
|
||||
float fb_freq = frequency * op3.ratio;
|
||||
float fb_mod_index = (feedback_amt * MOD_INDEX_COEFF);
|
||||
float fb_signal = feedback_osc.process_sample(trigger, fb_freq) * fb_mod_index;
|
||||
@@ -118,7 +125,8 @@ private:
|
||||
return op1.process_sample(gate, trigger, op1_freq, velocity, op2_signal) * op1.amplitude;
|
||||
}
|
||||
|
||||
float calc_algo2(const float frequency) {
|
||||
float calc_algo2(const float frequency)
|
||||
{
|
||||
float fb_freq = frequency * op3.ratio;
|
||||
float fb_mod_index = (feedback_amt * MOD_INDEX_COEFF);
|
||||
float fb_signal = feedback_osc.process_sample(trigger, fb_freq) * fb_mod_index;
|
||||
@@ -136,7 +144,8 @@ private:
|
||||
return op1_signal + op3_signal;
|
||||
}
|
||||
|
||||
float calc_algo3(const float frequency) {
|
||||
float calc_algo3(const float frequency)
|
||||
{
|
||||
float fb_freq = frequency * op3.ratio;
|
||||
float fb_mod_index = (feedback_amt * MOD_INDEX_COEFF);
|
||||
float fb_signal = feedback_osc.process_sample(trigger, fb_freq) * fb_mod_index;
|
||||
@@ -153,7 +162,8 @@ private:
|
||||
return op1_signal + op2_signal + op3_signal;
|
||||
}
|
||||
|
||||
float calc_algo4(const float frequency) {
|
||||
float calc_algo4(const float frequency)
|
||||
{
|
||||
float fb_freq = frequency * op3.ratio;
|
||||
float fb_mod_index = (feedback_amt * MOD_INDEX_COEFF);
|
||||
float fb_signal = feedback_osc.process_sample(trigger, fb_freq) * fb_mod_index;
|
||||
|
||||
Reference in New Issue
Block a user