Merge branch 'master' of git.peteshadbolt.co.uk:pete/radio

audio.scd

@@ -18,23 +18,25 @@ s.waitForBoot {
         lagtime = 100 / (2**octave);
 
         // Oscillator/filter frequency
-        frequency = notefreq * (1 + (hue*0.1));
+        // frequency = notefreq * (1 + (hue*0.1));
+        frequency = notefreq * (1 + (hue*5)) * (2**(octave-2));
         //frequency = (130 + (hue * 130)) * (2 ** octave);
         //frequency = 130 * Scale.major.ratios[(hue * 12).asInteger];
         //frequency = (130 * frequency) * (2**octave);
         frequency = Lag.kr(frequency, lagtime/10);
         
         // Filtered saw oscillator
-        oscillator = Mix.ar([SawDPW.ar(frequency), SawDPW.ar(frequency/2+0.5)]);
+        // oscillator = Mix.ar([SawDPW.ar(frequency), SawDPW.ar(frequency/2+0.5)]);
+        oscillator = Mix.ar([DPW3Tri.ar(frequency), DPW3Tri.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);
+        qfactor = Lag.kr((1 - saturation)**2, lagtime);
+        noise = Crackle.ar(1.9, 1.0);
         noise = BPF.ar(noise, frequency, qfactor);
 
         // Mix noise and saw
-        mixer = Mix.ar([filter * saturation.sqrt(), 0.5 * noise*(1-saturation)]);
+        mixer = Mix.ar([filter * saturation.sqrt(), 3* noise*(1-saturation)]);
 
         // Apply pan
         panner = LinPan2.ar(mixer, pan);
@@ -46,8 +48,11 @@ s.waitForBoot {
         // Compress
         output = Compander.ar(output, output, 0.5, 0.3, 0.3, 0.1, lagtime);
 
+        // Fade in on boot
+        output = output * Lag.kr(gain, lagtime);
+
         // Crank everything down
-        output = output * 0.1; 
+        output = output * 0.3; 
 
         Out.ar(0, output);
     });
@@ -63,11 +68,26 @@ s.waitForBoot {
             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)]
+                [\hue, 0.5, \saturation, 0.1, \value, 0.5, \pan, pan, \gain, 0.0, \octave, octave, \notefreq, Scale.major.degreeToFreq(index, 48.midicps, octave)]
             )
         }
     );
 
+    // Turn up gain after some time
+    SystemClock.schedAbs(8, {modules[0].set(\gain, 1)});
+    SystemClock.schedAbs(8, {modules[1].set(\gain, 1)});
+    SystemClock.schedAbs(8, {modules[2].set(\gain, 1)});
+    SystemClock.schedAbs(8, {modules[3].set(\gain, 1)});
+    SystemClock.schedAbs(16, {modules[4].set(\gain, 1)});
+    SystemClock.schedAbs(16, {modules[5].set(\gain, 1)});
+    SystemClock.schedAbs(16, {modules[6].set(\gain, 1)});
+    SystemClock.schedAbs(16, {modules[7].set(\gain, 1)});
+    SystemClock.schedAbs(32, {modules[8].set(\gain, 1)});
+    SystemClock.schedAbs(32, {modules[9].set(\gain, 1)});
+    SystemClock.schedAbs(32, {modules[10].set(\gain, 1)});
+    SystemClock.schedAbs(32, {modules[11].set(\gain, 1)});
+    SystemClock.schedAbs(32, {modules[12].set(\gain, 1)});
+
     // Hook up OSC
     f = { |msg, time, addr|
         if(msg[0] == '/radio') {

radio.py → stuff/gui.py

@@ -69,8 +69,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: