summaryrefslogtreecommitdiff
path: root/gens
diff options
context:
space:
mode:
authorGraham Northup <grissess@nexusg.org>2019-02-12 23:36:38 -0500
committerGraham Northup <grissess@nexusg.org>2019-02-12 23:36:38 -0500
commit5c39a9c26ddd9d7aa4a4fa1af0244348daab0011 (patch)
tree7cc0c140ed8c801d276f87a7663c67be75a842ee /gens
parent9f2b13aaf422014cb1988a8d91b55aef9c964f12 (diff)
parent23c79cc00eb5d8e76148d79af83a9ab838e602f3 (diff)
Merge branch 'work' into nogfx
Diffstat (limited to 'gens')
-rw-r--r--gens/test.gen10
-rw-r--r--gens/test_voice.gen2
2 files changed, 11 insertions, 1 deletions
diff --git a/gens/test.gen b/gens/test.gen
index 4613c0c..e891ebe 100644
--- a/gens/test.gen
+++ b/gens/test.gen
@@ -19,5 +19,15 @@
#gens/test_basic.gen#,
#gens/test_basic.gen#,
#gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
+ #gens/test_basic.gen#,
#gens/test_basic.gen#
]
diff --git a/gens/test_voice.gen b/gens/test_voice.gen
index 41684c1..d4ae66a 100644
--- a/gens/test_voice.gen
+++ b/gens/test_voice.gen
@@ -1 +1 @@
-(lutgen(sine(lut_freq), 128, v_freq) * controlrate(dahdsr(v_frame < v_deadline, 0, 4 / samplerate(), 0, 1, 1, 8 / samplerate()))) * v_amp
+(lutgen(saw(lut_freq), 128, v_freq) * dahdsr(v_frame < v_deadline, 0, 8 / samplerate(), 0, 0, 1, 4 / samplerate())) * v_amp