From dd17b0e238446faa195e13f60f662c8b38fbf50d Mon Sep 17 00:00:00 2001 From: Pete Shadbolt Date: Tue, 13 Jan 2015 16:32:44 +0000 Subject: [PATCH] Metronome still wont lock but oh well --- main.ck | 8 ++++---- main.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main.ck b/main.ck index d6fba6e..69e3d23 100644 --- a/main.ck +++ b/main.ck @@ -105,10 +105,10 @@ class LoopPedal public void setWet( float ratio ) { ratio => wet.gain; 1-ratio => dry.gain;} public void clear() { sample.clear(); } public void recordFrom(UGen ugen) { ugen => sample; } - public dur remaining() { sample.loopEnd() => dur ltime; return (ltime - sample.playPos()) % (ltime/4.); } - public int beat() { - <<< 4*sample.playPos()/sample.loopEnd()>>>; - return Math.round(4 * sample.playPos() / sample.loopEnd()) $ int; + public int beat() { return Math.round(4 * sample.playPos() / sample.loopEnd()) $ int; } + public dur remaining() { + sample.loopEnd() => dur ltime; + return (ltime - sample.playPos()) % (ltime/4.); } public void outputTo(UGen wetSink, UGen drySink) { diff --git a/main.py b/main.py index 1b0c67f..8335ba2 100644 --- a/main.py +++ b/main.py @@ -259,11 +259,11 @@ class FXPanel(wx.Panel): label.SetFont(font) sizer.Add(label, 0, wx.EXPAND | wx.TOP | wx.BOTTOM | wx.RIGHT, 5) - self.lpf = OSCSlider(self, "Lo-pass", default_value=.5, align=False) + self.lpf = OSCSlider(self, "Lo-pass", default_value=.9, 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, default_value=.5, align=False) + self.hpf = OSCSlider(self, "Hi-pass", min_value=0, default_value=.1, align=False) sizer.Add(self.hpf, 2, wx.EXPAND | wx.ALL, 5) self.hpf.Bind(wx.EVT_SCROLL, self.update)