aboutsummaryrefslogtreecommitdiffstats
path: root/maximilian.h
diff options
context:
space:
mode:
authormick grierson <mickgrierson@gmail.com>2016-12-19 22:56:37 +0000
committermick grierson <mickgrierson@gmail.com>2016-12-19 22:56:37 +0000
commit85d3fe3233cee889a9c2593d48ba1dea12d4a7a8 (patch)
tree73376d3e055d95b26e0b87afcce83f9b0894f789 /maximilian.h
parentcfb9046eec768c76baa4c0711870bb255c86ef4a (diff)
refactored, tested, bugfixed the new javascript samplerate-based envelopes. Should be good now...
Diffstat (limited to 'maximilian.h')
-rwxr-xr-xmaximilian.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/maximilian.h b/maximilian.h
index 54dec4b..2e8593d 100755
--- a/maximilian.h
+++ b/maximilian.h
@@ -124,14 +124,14 @@ class maxiEnvelope {
int isPlaying;
public:
- int trigger;
+ int trig;
double line(int numberofsegments,double segments[100]);
double ramp(double startVal=0, double endVal=1, double duration=1);
double ramps(std::vector<double> rampsArray);
double ar(double attack=0.1, double release=0.1);
double adsr(double attack=0.1, double decay=0.1, double sustain=0.1, double release=0.1);
-// void trigger(int index,double amp);
- void note(bool noteOn=false);
+ void trigger(int index,double amp);
+ void trigger(bool noteOn=false);
int valindex;
double amplitude;