Minor rearranging.

ctford · Nov 8, 2012 · 88d81bd · 88d81bd
1 parent f0e3cae
commit 88d81bd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/goldberg/variations/canone_alla_quarta.clj b/src/goldberg/variations/canone_alla_quarta.clj
@@ -9,7 +9,7 @@
 
 (ns goldberg.variations.canone-alla-quarta
   (:use [overtone.live :exclude
-          [scale midi->hz note sharp flat run]]
+          [scale pitch midi->hz note sharp flat run]]
         [quil.core :only
           [smooth sketch ellipse frame-rate background
            width height stroke stroke-weight fill]]))
@@ -118,7 +118,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defn note [timing pitch] {:time timing :pitch pitch}) 
-(defn where [k f notes] (->> notes (map #(update-in % [k] f)))) 
 
 (defn play! [notes] 
   (let [start (now)]
@@ -134,6 +133,9 @@
 ;(even-melody! (range 70 81))
 
 
+
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Scale                                           ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -207,6 +209,8 @@
 (defn bpm [beats] (fn [beat] (-> beat (/ beats) (* 60) (* 1000))))
 ;((bpm 120) 3)
 
+(defn where [k f notes] (->> notes (map #(update-in % [k] f)))) 
+
 ;(->> row-row-row-your-boat
 ;  (where :time (bpm 90))
 ;  (where :pitch (comp C major))