From b2938c7c750de8e0c91ab075b4d6324fec819bc3 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Sat, 7 May 2022 23:40:58 +0100
Subject: [PATCH] Commiting from rpi

---
 audio-perfect-scale.scd | 82 +++++++++++++++++++++++++++++++++++++++++
 audio.scd               |  4 +-
 radio.py                | 11 +++---
 test.scd                |  4 ++
 4 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 audio-perfect-scale.scd
 create mode 100644 test.scd

diff --git a/audio-perfect-scale.scd b/audio-perfect-scale.scd
new file mode 100644
index 0000000..76fc2b4
--- /dev/null
+++ b/audio-perfect-scale.scd
@@ -0,0 +1,82 @@
+// SVNVimStart
+
+s = Server.local;
+s.waitForBoot {
+    var module, msg, modules;
+
+    // Connect to OSC
+    thisProcess.openUDPPort(5005);
+    n = NetAddr.new("0.0.0.0", 5005);
+    o = OSCFunc({ arg msg, time, addr, recvPort; [msg, time, addr, recvPort].postln; }, '/radio', n);
+
+    // Create the synth definition and load it
+    module = SynthDef.new(\module, { 
+        arg hue, saturation, value, pan, gain, octave, notefreq;
+        var oscillator, noise, filter, panner, mixer, frequency, qfactor, lagtime, output, amplitude;
+
+        // Dynamic time of the module
+        lagtime = 100 / (2**octave);
+
+        // Oscillator/filter frequency
+        frequency = notefreq * (1 + (hue*0.01));
+        //frequency = (130 + (hue * 130)) * (2 ** octave);
+        //frequency = 130 * Scale.major.ratios[(hue * 12).asInteger];
+        //frequency = (130 * frequency) * (2**octave);
+        frequency = Lag.kr(frequency, lagtime/100);
+        
+        // Filtered saw oscillator
+        oscillator = Mix.ar([SawDPW.ar(frequency), SawDPW.ar(frequency/2+0.5)]);
+        filter = DFM1.ar(oscillator, frequency, saturation/2, 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.sqrt(), 0.5 * noise*(1-saturation)]);
+
+        // Apply pan
+        panner = LinPan2.ar(mixer, pan);
+
+        // Apply dynamics
+        amplitude = Lag.kr(HPF.kr(value, 4 * hue / (lagtime)), lagtime);
+        output = panner * amplitude;
+
+        // Compress
+        output = Compander.ar(output, output, 0.5, 0.3, 0.3, 0.1, lagtime);
+
+        // Crank everything down
+        output = output * 0.1; 
+
+        Out.ar(0, output);
+    });
+    module.load(s);
+    s.sync;
+
+    // Create multiple sound generators
+    modules = Array.fill(12, 
+        {
+            arg index; 
+            var pan, octave;
+            pan = 0 - ((index % 4) - 1.5)/1.5;
+            octave = (2 - (index / 4).floor);
+            "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, \notefreq, Scale.major.degreeToFreq(index, 48.midicps, octave)]
+            )
+        }
+    );
+
+    // Hook up OSC
+    f = { |msg, time, addr|
+        if(msg[0] == '/radio') {
+            if(msg[1]<modules.size){
+                modules[msg[1]].set(\hue, msg[2]);
+                modules[msg[1]].set(\saturation, msg[3]);
+                modules[msg[1]].set(\value, msg[4]);
+            }
+        }
+    };
+    thisProcess.addOSCRecvFunc(f);
+};
diff --git a/audio.scd b/audio.scd
index 76fc2b4..8667122 100644
--- a/audio.scd
+++ b/audio.scd
@@ -18,11 +18,11 @@ s.waitForBoot {
         lagtime = 100 / (2**octave);
 
         // Oscillator/filter frequency
-        frequency = notefreq * (1 + (hue*0.01));
+        frequency = notefreq * (1 + (hue*0.1));
         //frequency = (130 + (hue * 130)) * (2 ** octave);
         //frequency = 130 * Scale.major.ratios[(hue * 12).asInteger];
         //frequency = (130 * frequency) * (2**octave);
-        frequency = Lag.kr(frequency, lagtime/100);
+        frequency = Lag.kr(frequency, lagtime/10);
         
         // Filtered saw oscillator
         oscillator = Mix.ar([SawDPW.ar(frequency), SawDPW.ar(frequency/2+0.5)]);
diff --git a/radio.py b/radio.py
index 79bfdb0..523a2ea 100644
--- a/radio.py
+++ b/radio.py
@@ -60,12 +60,11 @@ def analyze(frame, osc):
     send = False
     if time.time() - LAST_MESSAGE_TIME > 0.1:
         LAST_MESSAGE_TIME = time.time()
-        send = True
-    for index, (y, x) in enumerate(it.product(range(m), range(n))):
-        sp = (int(x * dx), int(y * dy))
-        ep = (int(x * dx + dx), int(y * dy + dy))
-        frame = draw_rectangle(frame, sp, ep)
-        frame = analyze_block(frame, osc, index, sp, ep, send)
+        for index, (y, x) in enumerate(it.product(range(m), range(n))):
+            sp = (int(x * dx), int(y * dy))
+            ep = (int(x * dx + dx), int(y * dy + dy))
+            frame = draw_rectangle(frame, sp, ep)
+            frame = analyze_block(frame, osc, index, sp, ep, True)
     return frame
 
 
diff --git a/test.scd b/test.scd
new file mode 100644
index 0000000..3a1e5e3
--- /dev/null
+++ b/test.scd
@@ -0,0 +1,4 @@
+s = Server.local;
+s.waitForBoot {
+    { SinOsc.ar() }.play; 
+}