Browse Source

instr_grainlet - remove env, dont need it (have track env now)

main
heck 7 months ago
parent
commit
4122980e59
  1. 13
      src/instr_grainlet.cc
  2. 1
      src/instr_grainlet.hh

13
src/instr_grainlet.cc

@ -8,22 +8,15 @@ namespace Heck {
Grainlet::Grainlet() Grainlet::Grainlet()
{ {
init(); init();
grainlet.Init(samplerate);
} }
void Grainlet::init() void Grainlet::init()
{ {
volEnv.Init(samplerate); grainlet.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);
} }
void Grainlet::trigger() void Grainlet::trigger()
{ {
volEnv.Trigger();
} }
void Grainlet::ctl(unsigned int ctl_nr, float val) void Grainlet::ctl(unsigned int ctl_nr, float val)
@ -33,7 +26,7 @@ namespace Heck {
grainlet.SetFreq(scalen_min_max(val, 40, 400)); grainlet.SetFreq(scalen_min_max(val, 40, 400));
} break; } break;
case 1: { case 1: {
volEnv.SetTime(dsp::ADENV_SEG_DECAY, 0.01 + val * 8.);
} break; } break;
case 2: { case 2: {
grainlet.SetFormantFreq(scalen_min_max(val, 400, 2000)); grainlet.SetFormantFreq(scalen_min_max(val, 400, 2000));
@ -58,8 +51,6 @@ namespace Heck {
{ {
float out{}; float out{};
out = grainlet.Process(); out = grainlet.Process();
float volEnv_sig = volEnv.Process();
out *= volEnv_sig;
return out; return out;
} }

1
src/instr_grainlet.hh

@ -22,7 +22,6 @@ namespace Heck {
float nextsample() override; float nextsample() override;
private: private:
dsp::GrainletOscillator grainlet{}; dsp::GrainletOscillator grainlet{};
dsp::AdEnv volEnv{};
float mode1{}; float mode1{};
float mode2{}; float mode2{};
}; };

Loading…
Cancel
Save