# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1345766294 14400
# Node ID 6ce1d5fd491193479d4d8ea43280e5fe6b0c9717
# Parent  15cc0c944ccdf3f7e3af8d976744ecdb54c09db5
update choreo files.

diff -r 15cc0c944ccd -r 6ce1d5fd4911 clojure/com/aurellem/run/basic_choreo.clj
--- a/clojure/com/aurellem/run/basic_choreo.clj	Wed Jun 27 19:56:20 2012 -0500
+++ b/clojure/com/aurellem/run/basic_choreo.clj	Thu Aug 23 19:58:14 2012 -0400
@@ -1,6 +1,6 @@
 ;;;; "Basic Choreography" -- just show off audio/video
 
-(ns com.aurellem.run.basic_choreo
+(ns com.aurellem.run.basic-choreo
   (:use (com.aurellem.gb saves gb-driver util constants
                          items vbm characters money
                          rlm-assembly))
diff -r 15cc0c944ccd -r 6ce1d5fd4911 clojure/com/aurellem/run/final_cut.clj
--- a/clojure/com/aurellem/run/final_cut.clj	Wed Jun 27 19:56:20 2012 -0500
+++ b/clojure/com/aurellem/run/final_cut.clj	Thu Aug 23 19:58:14 2012 -0400
@@ -155,6 +155,26 @@
       move-images screenshots ram-maps targets))))
 
 
+;; (defn final-cut! [^File render-dir]
+;;   (let [movie (File. render-dir "final.ogg")
+;;         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))
+;;     (clojure.java.shell/sh
+;;      "ffmpeg" "-r" "60" ;; maybe 59.7 ???!
+;;      "-i" (str (.getCanonicalPath final) "/" "%07d.bmp")
+;;      "-i" (.getCanonicalPath final-audio)
+;;      "-b:a" "128k"
+;;      "-b:v" "9000k"
+;;      "-c:a" "libvorbis"
+;;      "-f"   "webm"
+;;      "-g"   "200"
+;;      (.getCanonicalPath movie)) nil))
+
 (defn final-cut! [^File render-dir]
   (let [movie (File. render-dir "final.ogg")
         final-audio (File. render-dir "final.wav")
@@ -165,16 +185,17 @@
      "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
      (.getCanonicalPath final-audio))
     (clojure.java.shell/sh
-     "ffmpeg" "-r" "60" ;; maybe 59.7 ???!
+     "ffmpeg"
+     "-framerate" "60" 
      "-i" (str (.getCanonicalPath final) "/" "%07d.bmp")
      "-i" (.getCanonicalPath final-audio)
      "-b:a" "128k"
      "-b:v" "9000k"
      "-c:a" "libvorbis"
-     "-f"   "webm"
-     "-g"   "200"
+     "-c:v" "libtheora"
+     "-r" "60"
      (.getCanonicalPath movie)) nil))
-     
+
   
 (comment