From 1fb5a6613e13f24f05707d6174e71d5e31875d08 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <pete.shadbolt@gmail.com>
Date: Fri, 9 Jan 2015 17:14:52 +0000
Subject: [PATCH] FX

---
 main.ck | 6 ++++--
 main.py | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/main.ck b/main.ck
index f43d901..5c9ffa0 100644
--- a/main.ck
+++ b/main.ck
@@ -3,7 +3,7 @@
 // TODO: currently I don't turn ADC thru back on after recording
 
 // Effects chain with limiters, reverb, filters
-NRev reverb => LPF lpf => Dyno outputLimiter => dac;
+NRev reverb => LPF lpf => HPF hpf => Dyno outputLimiter => dac;
 outputLimiter.limit();
 reverb @=> UGen @ outputWet; // Reference to wet output
 outputLimiter @=> UGen @ outputDry; // Reference to dry output
@@ -18,6 +18,7 @@ inputLimiter @=> UGen @ mainInput;
 // Default parameters
 .5 => adcThru.gain;
 10000 => lpf.freq;
+10 => hpf.freq;
 1::second => dur loopTime;
 
 // Plug in the pedals
@@ -67,7 +68,8 @@ while (true) {
         }
         else if(msg.address=="/fx") {
             (100+msg.getFloat(0)*10000) => lpf.freq;
-            msg.getFloat(1) => reverb.mix;
+            (100+msg.getFloat(1)*10000) => hpf.freq;
+            msg.getFloat(2) => reverb.mix;
         }
         else if(msg.address=="/master") {
             msg.getFloat(0) => mainOutput.gain;
diff --git a/main.py b/main.py
index bf49d18..1926e0a 100644
--- a/main.py
+++ b/main.py
@@ -227,10 +227,14 @@ class FXPanel(wx.Panel):
         #sizer.Add(self.fxtype, 1, wx.ALL|wx.EXPAND, 5)
         #self.fxtype.SetValue(choices[0])
 
-        self.lpf=OSCSlider(self, "Lowpass", default_value=.5, align=False)
+        self.lpf=OSCSlider(self, "Lo-pass", default_value=.5, align=False)
         sizer.Add(self.lpf, 2, wx.EXPAND|wx.ALL, 5)
         self.lpf.Bind(wx.EVT_SCROLL, self.update)
 
+        self.hpf=OSCSlider(self, "Hi-pass", min_value=0.1, default_value=.5, align=False)
+        sizer.Add(self.hpf, 2, wx.EXPAND|wx.ALL, 5)
+        self.hpf.Bind(wx.EVT_SCROLL, self.update)
+
         self.reverb=OSCSlider(self, "Reverb", default_value=.5, align=False)
         sizer.Add(self.reverb, 2, wx.EXPAND|wx.ALL, 5)
         self.reverb.Bind(wx.EVT_SCROLL, self.update)
@@ -240,8 +244,9 @@ class FXPanel(wx.Panel):
 
     def update(self, evt):
         a=self.lpf.slider.GetValue()/100.
+        a2=self.hpf.slider.GetValue()/100.
         b=self.reverb.slider.GetValue()/100.
-        sendOSCSafe("/fx", [a,b])
+        sendOSCSafe("/fx", [a,a2,b])
 
 class OutputPanel(wx.Panel):
     ''' Handle the ADC input settings '''