From 5362ca41e24cdb92b449a9fb727cea243f8508a0 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <pete.shadbolt@gmail.com>
Date: Wed, 7 Jan 2015 11:55:09 +0000
Subject: [PATCH] Merge

---
 main.ck | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.ck b/main.ck
index 8615755..b522fec 100644
--- a/main.ck
+++ b/main.ck
@@ -2,8 +2,8 @@
 // Effects chain
 adc => Dyno limitIn => Gain adcThru => dac; // Monitor input through a mixer
 // Global effects break panning for some unknown reason
-/*Dyno limitOut => JCRev rev => dac;*/
-/*Dyno limitOut => JCRev rev => dac;*/
+Dyno limitOut => PRCRev rev => dac;
+.3 => rev.mix;
 limitIn.limit(); limitOut.limit();
 SampleChan channels[4];
 
@@ -24,7 +24,7 @@ OscMsg msg;
 
 // Start the metronome
 0 => int metronomeLevel;
-//spork ~plip();
+//spork ~metronome();
 //spork ~vu_meter();
 
 // Event loop
@@ -115,7 +115,7 @@ fun void vu_meter()
 
 
 // TODO timing here should be done using events
-fun void plip()
+fun void metronome()
 {
     SinOsc s => dac;
     0.01::second => dur plipTime;