Merge pull request #2 from nblumoe/draw-manipulation

[WIP] Refactor tap-sound, change frequency of tap

src/clj_tunes/oscilloscope.clj

@@ -6,38 +6,58 @@
 (defn- setup []
   (q/smooth)
   (q/frame-rate 30)
-  (q/background 0)
-  (q/stroke 0 255 0)
-  (q/fill 0 255 0))
+  (q/background (q/random 0))
+  (q/stroke 0)
+  ;(q/stroke (q/random 255))
+  (q/stroke-weight 3)
+  (q/fill (q/random 255)))
 
 (defn- oscilloscope
   [& {:keys [max-time max-amplitude]
       :or {max-time 1
            max-amplitude 2}}]
-  (let [time-scale (/ (q/width) max-time)
-        amp-scale (/ (q/height) 2 max-amplitude)]
-    (q/background 0)
+  (let [time-scale (/  (* 2(q/width)) max-time)
+        amp-scale (/ (q/height) max-amplitude)]
+    ;(q/background (q/random 255))
+    (q/background 255 255 255)
     (q/with-translation [0 (/ (q/height) 2)]
       (loop [points (tap/get-buffered-taps)]
         (when (next points)
           (let [[x1 y1] (first points)
                 [x2 y2] (second points)]
-            (q/line (* time-scale x1) (* amp-scale y1)
-                    (* time-scale x2) (* amp-scale y2))
+            (q/line (* time-scale x2) (* amp-scale y1) ; x,y values from sound aplitude tapping
+                    (* time-scale x1) (* amp-scale y2)) 
+            (q/line (* time-scale x1) (-(* amp-scale y1)) ;negated y value for a mirrored line
+                   (* time-scale x2) (-(* amp-scale y2))) 
             (recur (next points))))))))
 
 ;; TODO allow plotting multiple oscillators
 (defn plot-osc [duration]
   (q/defsketch osc-plot
-    :size [600 600]
+    :size [1266 668]
     :draw (fn [] (oscilloscope :max-time duration))
     :setup setup
-    :display 1)
+    :display 0)
   (stop)
   (tap/clear-buffer!))
 
-(defn tap-sound [duration sample-path]
+;(def sound-path (sample "/home/tamara/Desktop/activity_unproductive.wav"))
+;(defn tap-sound [duration sound]
+;  (plot-osc duration)
+;  (sound)
+;  (tap/start-tapping :buffered? true :freq 300))
+
+(defn tap-sound [duration sound-path]
   (plot-osc duration)
-  (sample sample-path)
-  (tap/start-tapping :buffered? true :freq 300))
+  (let [sound-map (sample sound-path)]
+    (sound-map))
+  (tap/start-tapping :buffered? true :freq 20))
+
+(def sample-buf (load-sample "/home/tamara/Desktop/activity_unproductive.wav"))
+
+(defsynth reverb-on-left []
+  (let [dry (play-buf 1 sample-buf)
+    wet (free-verb dry 1)]
+    (out 0 [wet dry])))
+