# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1336140214 18000
# Node ID 221b3fea9221bd4ed74dbb95535139ad942beb30
# Parent  91db9d1ce213f59938e67185f7b9bf4240d05289
slight cleanup.

diff -r 91db9d1ce213 -r 221b3fea9221 clojure/com/aurellem/run/music.clj
--- a/clojure/com/aurellem/run/music.clj	Fri May 04 08:55:15 2012 -0500
+++ b/clojure/com/aurellem/run/music.clj	Fri May 04 09:03:34 2012 -0500
@@ -9,28 +9,28 @@
   (:import java.io.File))
 
 (def pony
-  (File. "/home/r/proj/vba-clojure/music/pony-title.mid"))
+  (File. user-home "/proj/vba-clojure/music/pony-title.mid"))
 
 (def pony-csv 
-  (File. "/home/r/proj/vba-clojure/music/pony-title.csv"))
+  (File. user-home "proj/vba-clojure/music/pony-title.csv"))
   
 (def sync-test
-  (File. "/home/r/proj/vba-clojure/music/sync-test.mid"))
+  (File. user-home "proj/vba-clojure/music/sync-test.mid"))
 
 (def drum-test
-  (File. "/home/r/proj/vba-clojure/music/drum-test.mid"))
+  (File. user-home "proj/vba-clojure/music/drum-test.mid"))
 
 (def regret
-  (File. "/home/r/proj/vba-clojure/music/ship-of-regret-and-sleep.mid"))
+  (File. user-home "proj/vba-clojure/music/ship-of-regret-and-sleep.mid"))
 
 (def regret-csv
-  (File. "/home/r/proj/vba-clojure/music/ship-of-regret-and-sleep.csv"))
+  (File. user-home "proj/vba-clojure/music/ship-of-regret-and-sleep.csv"))
 
 (def mother
-  (File. "/home/r/proj/vba-clojure/music/mother.mid"))
+  (File. user-home "proj/vba-clojure/music/mother.mid"))
 
 (def mother-csv
-  (File. "/home/r/proj/vba-clojure/music/mother.csv"))
+  (File. user-home "proj/vba-clojure/music/mother.csv"))
 
 
 (defn raw-midi-text [#^File midi-file]
@@ -688,12 +688,15 @@
       0x05])]))
 
 (defn play-pony []
+  (println "playing" (.getName pony-csv))
   (run-moves (play-midi pony-csv) (repeat 1800 [])))
 
 (defn play-regret []
+  (println "playing" (.getName regret-csv))
   (run-moves (play-midi regret-csv) (repeat 3380 [])))
 
 (defn play-mother []
+  (println "playing" (.getName mother-csv))
   (run-moves (play-midi mother-csv) (repeat 2200 [])))
 
 (defn demo [] (play-mother) (play-regret) (play-pony))