diff --git a/cabbages/dentaku.csd b/cabbages/dentaku.csd index 83a2e74..ca9c289 100644 --- a/cabbages/dentaku.csd +++ b/cabbages/dentaku.csd @@ -59,42 +59,35 @@ instr 1 ; ; base freq is changeable by "tempo" slider -kWaveform chnget "waveform" +iWaveform chnget "waveform" komplex init 0 ift init -1 - -if changed:k(kWaveform)==1 then - reinit init -endif - -init: - -if kWaveform == 0 then +if iWaveform == 0 then kpw = 11/16 kpf = 1 komplex = 0 -elseif kWaveform == 1 then +elseif iWaveform == 1 then kpw = 1/2 kpf = 2 komplex = 0 -elseif kWaveform == 2 then +elseif iWaveform == 2 then kpw = 1/2 kpf = 1 komplex = 0 -elseif kWaveform == 3 then +elseif iWaveform == 3 then komplex = 1 ift = 103 kpf = 1/2 -elseif kWaveform == 4 then +elseif iWaveform == 4 then komplex = 1 ift = 101 kpf = 1/2 -elseif kWaveform == 5 then +elseif iWaveform == 5 then komplex = 1 ift = 102 kpf = 1/2 -elseif kWaveform == 6 then +elseif iWaveform == 6 then kpw = 1/7 kpf = 1/2 komplex = 0 @@ -108,7 +101,7 @@ endif kEnv madsr .1, .2, .6, .4 -printks "wav = %d kpw = %5.2f kpf = %5.2f kft = %d komplex = %d\n", 2, kWaveform, kpw, kpf, ift, komplex +printks "wav = %d kpw = %5.2f kpf = %5.2f kft = %d komplex = %d\n", 2, iWaveform, kpw, kpf, ift, komplex if komplex == 1 then printks "komplex %d\n", 1, ift