# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1346678086 18000
# Node ID 743b7b68e74ef563882b89d29f4dcf001569a472
# Parent  47572d4444857cd97a8716ec92b73e8645ba3e02
added video without buttons.

diff -r 47572d444485 -r 743b7b68e74e clojure/com/aurellem/run/final_cut.clj
--- a/clojure/com/aurellem/run/final_cut.clj	Sun Sep 02 23:44:22 2012 -0500
+++ b/clojure/com/aurellem/run/final_cut.clj	Mon Sep 03 08:14:46 2012 -0500
@@ -135,26 +135,34 @@
 ;;      (.getCanonicalPath movie)) nil))
 
 (defn final-cut! [^File render-dir]
-  (let [movie (File. render-dir "rlm-yellow-hack.avi")
+  (let [movie-with-buttons (File. render-dir "rlm-yellow-hack.avi")
         final-audio (File. render-dir "final.mp3")
-        final (File. render-dir "final")]
-    (.delete movie)
-    (.delete final-audio)
-    (clojure.java.shell/sh
-     "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
-     (.getCanonicalPath final-audio))
-    (clojure.java.shell/sh
-     "ffmpeg"
-     "-framerate" "60" 
-     "-i" (str (.getCanonicalPath final) "/" "%07d.png")
-     "-i" (.getCanonicalPath final-audio)
-     "-b:a" "128k"
-     "-b:v" "9000k"
-     "-c:a" "libmp3lame"
-     "-c:v" "mpeg4"
-     "-r" "60"
-     (.getCanonicalPath movie)) nil))
+        frames-with-buttons (File. render-dir "final")
+        frames (File. render-dir "frames")
+        movie (File. render-dir "rlm-yellow-hack-no-buttons.avi")
 
+        render-video
+        (fn [frames movie]
+          (.delete movie)
+          (.delete final-audio)
+          (clojure.java.shell/sh
+           "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
+           (.getCanonicalPath final-audio))
+          (clojure.java.shell/sh
+           "ffmpeg"
+           "-framerate" "60" 
+           "-i" (str (.getCanonicalPath frames) "/" "%07d.png")
+           "-i" (.getCanonicalPath final-audio)
+           "-b:a" "128k"
+           "-b:v" "9000k"
+           "-c:a" "libmp3lame"
+           "-c:v" "mpeg4"
+           "-r" "60"
+           (.getCanonicalPath movie)))]
+
+        (render-video frames-with-buttons movie-with-buttons)
+        (render-video frames movie)
+        nil))
   
 (comment