1.1 --- a/clojure/com/aurellem/run/basic_choreo.clj	Wed Jun 27 14:08:59 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/basic_choreo.clj	Wed Jun 27 19:38:13 2012 -0500
     1.3 @@ -81,7 +81,6 @@
     1.4  
     1.5  (defn basic-step-2! []
     1.6    (generate-composite-frames!
     1.7 -   basic-render-dir
     1.8 -   (basic-steps)))
     1.9 +   basic-render-dir))
    1.10  
    1.11  (defn basic-step-3! [] (final-cut! basic-render-dir))

     2.1 --- a/clojure/com/aurellem/run/final_cut.clj	Wed Jun 27 14:08:59 2012 -0500
     2.2 +++ b/clojure/com/aurellem/run/final_cut.clj	Wed Jun 27 19:38:13 2012 -0500
     2.3 @@ -49,9 +49,7 @@
     2.4             wave-writer (WaveWriter. audio-file)
     2.5             moves (vec moves)
     2.6             desired-fps 60
     2.7 -           seconds-per-frame (/ 1.0 desired-fps)
     2.8 -
     2.9 -           ]
    2.10 +           seconds-per-frame (/ 1.0 desired-fps)]
    2.11         (set-state! initial-state)
    2.12         ;; clear sound buffer
    2.13         (sound-bytes)
    2.14 @@ -138,9 +136,10 @@
    2.15     target])
    2.16  
    2.17  (defn generate-composite-frames!
    2.18 -  [^File rendered-dir moves]
    2.19 +  [^File rendered-dir]
    2.20    (let [final-frames (File. rendered-dir "final")
    2.21          _ (.mkdir final-frames)
    2.22 +        move-images (file-names (File. rendered-dir "moves"))
    2.23          screenshots (file-names (File. rendered-dir "frames"))
    2.24          ram-maps    (file-names (File. rendered-dir "ram-map"))
    2.25          targets (map #(.getCanonicalPath
    2.26 @@ -152,8 +151,8 @@
    2.27         (partial apply clojure.java.shell/sh)
    2.28         flatten
    2.29         (partial apply composite-frames-command)
    2.30 -       (fn [a b c d] (println c) [a b c d]))
    2.31 -      screenshots ram-maps targets moves))))
    2.32 +       (fn [a b c d] (println d) [a b c d]))
    2.33 +      move-images screenshots ram-maps targets))))
    2.34  
    2.35  
    2.36  (defn final-cut! [^File render-dir]
    2.37 @@ -161,6 +160,7 @@
    2.38          final-audio (File. render-dir "final.wav")
    2.39          final (File. render-dir "final")]
    2.40      (.delete movie)
    2.41 +    (.delete final-audio)
    2.42      (clojure.java.shell/sh
    2.43       "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
    2.44       (.getCanonicalPath final-audio))
    2.45 @@ -171,7 +171,7 @@
    2.46       "-b:a" "128k"
    2.47       "-b:v" "9000k"
    2.48       "-c:a" "libvorbis"
    2.49 -     "-c:v" "libtheora"
    2.50 +     "-f"   "webm"
    2.51       "-g"   "200"
    2.52       (.getCanonicalPath movie)) nil))
    2.53