diff --git a/dev.scd b/dev.scd index ace2408..5a15f2e 100644 --- a/dev.scd +++ b/dev.scd @@ -23,14 +23,21 @@ s.waitForBoot { // Filtered saw oscillator oscillator = SawDPW.ar(frequency); - filter = DFM1.ar(oscillator, frequency*0.8, 0.8, 1.0, 0.0, 0.0006); + filter = DFM1.ar(oscillator, frequency*0.5, 0.8, 1.0, 0.0, 0.0006); + + // Noise + qfactor = Lag.kr((1 - saturation)**4, lagtime); + noise = Crackle.ar(1.99, 1.0); + noise = BPF.ar(noise, frequency, qfactor); + + // Mix noise and saw + mixer = Mix.ar([filter * saturation, noise*(1-saturation)]); // Apply pan - panner = LinPan2.ar(filter, pan); + panner = LinPan2.ar(mixer, pan); // Apply dynamics - output = panner * Lag.kr(HPF.kr(value, hue / (lagtime)), lagtime*4); - //output = panner * BPF.kr(value, 1 / lagtime, 100); + output = panner * Lag.kr(HPF.kr(value, 4 * hue / (lagtime)), lagtime); // Compress output = Compander.ar(output, output, 0.5, 0.3, 0.3, 0.1, lagtime); @@ -49,7 +56,7 @@ s.waitForBoot { arg index; var pan, octave; pan = 0 - ((index % 4) - 1.5)/1.5; - octave = (2 - (index / 4).floor); + octave = (2 - (index / 4).floor) * 2; "Module %: Pan %, octave %\n".postf(index, pan.round(1e-1), octave.round(1e-1)); Synth.new(\module, [\hue, 0.5, \saturation, 0.1, \value, 0.5, \pan, pan, \gain, 0.9, \octave, octave] diff --git a/headless.py b/headless.py index 78f941f..2b23998 100644 --- a/headless.py +++ b/headless.py @@ -47,8 +47,8 @@ def analyze(frame, osc): if __name__ == '__main__': - # camera = cv2.VideoCapture("/dev/video2") - camera = cv2.VideoCapture(0) + camera = cv2.VideoCapture("/dev/video2") + #camera = cv2.VideoCapture(0) osc = udp_client.SimpleUDPClient("0.0.0.0", 5005) print("Radio is running...") diff --git a/radio.py b/radio.py index 31b8448..79bfdb0 100644 --- a/radio.py +++ b/radio.py @@ -70,8 +70,8 @@ def analyze(frame, osc): if __name__ == '__main__': - # camera = cv2.VideoCapture("/dev/video2") - camera = cv2.VideoCapture(0) + camera = cv2.VideoCapture("/dev/video2") + # camera = cv2.VideoCapture(0) osc = udp_client.SimpleUDPClient("0.0.0.0", 5005) while True: