From 4122980e59469d988e553e571ac3e50f5a75440f Mon Sep 17 00:00:00 2001 From: heck Date: Fri, 13 Sep 2024 20:30:36 +0200 Subject: [PATCH] instr_grainlet - remove env, dont need it (have track env now) --- src/instr_grainlet.cc | 13 ++----------- src/instr_grainlet.hh | 1 - 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/instr_grainlet.cc b/src/instr_grainlet.cc index 22d4390..c7db210 100644 --- a/src/instr_grainlet.cc +++ b/src/instr_grainlet.cc @@ -8,22 +8,15 @@ namespace Heck { Grainlet::Grainlet() { init(); - grainlet.Init(samplerate); } void Grainlet::init() { - volEnv.Init(samplerate); - volEnv.SetTime(dsp::ADENV_SEG_ATTACK, .0001); - volEnv.SetTime(dsp::ADENV_SEG_DECAY, 0.1); - volEnv.SetMax(1); - volEnv.SetMin(0); - volEnv.SetCurve(-18); + grainlet.Init(samplerate); } void Grainlet::trigger() { - volEnv.Trigger(); } void Grainlet::ctl(unsigned int ctl_nr, float val) @@ -33,7 +26,7 @@ namespace Heck { grainlet.SetFreq(scalen_min_max(val, 40, 400)); } break; case 1: { - volEnv.SetTime(dsp::ADENV_SEG_DECAY, 0.01 + val * 8.); + } break; case 2: { grainlet.SetFormantFreq(scalen_min_max(val, 400, 2000)); @@ -58,8 +51,6 @@ namespace Heck { { float out{}; out = grainlet.Process(); - float volEnv_sig = volEnv.Process(); - out *= volEnv_sig; return out; } diff --git a/src/instr_grainlet.hh b/src/instr_grainlet.hh index 24f4e4b..07a4339 100644 --- a/src/instr_grainlet.hh +++ b/src/instr_grainlet.hh @@ -22,7 +22,6 @@ namespace Heck { float nextsample() override; private: dsp::GrainletOscillator grainlet{}; - dsp::AdEnv volEnv{}; float mode1{}; float mode2{}; };