# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1340843893 18000
# Node ID b3b7a06686c4b5178d41347af66da64b20df7ff1
# Parent  36e5fa62eb3cba5d9b08f77a3c072007d318439e
all synching issues resolved.

diff -r 36e5fa62eb3c -r b3b7a06686c4 clojure/com/aurellem/run/basic_choreo.clj
--- a/clojure/com/aurellem/run/basic_choreo.clj	Wed Jun 27 14:08:59 2012 -0500
+++ b/clojure/com/aurellem/run/basic_choreo.clj	Wed Jun 27 19:38:13 2012 -0500
@@ -81,7 +81,6 @@
 
 (defn basic-step-2! []
   (generate-composite-frames!
-   basic-render-dir
-   (basic-steps)))
+   basic-render-dir))
 
 (defn basic-step-3! [] (final-cut! basic-render-dir))
diff -r 36e5fa62eb3c -r b3b7a06686c4 clojure/com/aurellem/run/final_cut.clj
--- a/clojure/com/aurellem/run/final_cut.clj	Wed Jun 27 14:08:59 2012 -0500
+++ b/clojure/com/aurellem/run/final_cut.clj	Wed Jun 27 19:38:13 2012 -0500
@@ -49,9 +49,7 @@
            wave-writer (WaveWriter. audio-file)
            moves (vec moves)
            desired-fps 60
-           seconds-per-frame (/ 1.0 desired-fps)
-
-           ]
+           seconds-per-frame (/ 1.0 desired-fps)]
        (set-state! initial-state)
        ;; clear sound buffer
        (sound-bytes)
@@ -138,9 +136,10 @@
    target])
 
 (defn generate-composite-frames!
-  [^File rendered-dir moves]
+  [^File rendered-dir]
   (let [final-frames (File. rendered-dir "final")
         _ (.mkdir final-frames)
+        move-images (file-names (File. rendered-dir "moves"))
         screenshots (file-names (File. rendered-dir "frames"))
         ram-maps    (file-names (File. rendered-dir "ram-map"))
         targets (map #(.getCanonicalPath
@@ -152,8 +151,8 @@
        (partial apply clojure.java.shell/sh)
        flatten
        (partial apply composite-frames-command)
-       (fn [a b c d] (println c) [a b c d]))
-      screenshots ram-maps targets moves))))
+       (fn [a b c d] (println d) [a b c d]))
+      move-images screenshots ram-maps targets))))
 
 
 (defn final-cut! [^File render-dir]
@@ -161,6 +160,7 @@
         final-audio (File. render-dir "final.wav")
         final (File. render-dir "final")]
     (.delete movie)
+    (.delete final-audio)
     (clojure.java.shell/sh
      "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
      (.getCanonicalPath final-audio))
@@ -171,7 +171,7 @@
      "-b:a" "128k"
      "-b:v" "9000k"
      "-c:a" "libvorbis"
-     "-c:v" "libtheora"
+     "-f"   "webm"
      "-g"   "200"
      (.getCanonicalPath movie)) nil))