1.1 --- a/clojure/com/aurellem/run/basic_choreo.clj	Wed Jun 27 19:56:20 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/basic_choreo.clj	Thu Aug 23 19:58:14 2012 -0400
     1.3 @@ -1,6 +1,6 @@
     1.4  ;;;; "Basic Choreography" -- just show off audio/video
     1.5  
     1.6 -(ns com.aurellem.run.basic_choreo
     1.7 +(ns com.aurellem.run.basic-choreo
     1.8    (:use (com.aurellem.gb saves gb-driver util constants
     1.9                           items vbm characters money
    1.10                           rlm-assembly))

     2.1 --- a/clojure/com/aurellem/run/final_cut.clj	Wed Jun 27 19:56:20 2012 -0500
     2.2 +++ b/clojure/com/aurellem/run/final_cut.clj	Thu Aug 23 19:58:14 2012 -0400
     2.3 @@ -155,6 +155,26 @@
     2.4        move-images screenshots ram-maps targets))))
     2.5  
     2.6  
     2.7 +;; (defn final-cut! [^File render-dir]
     2.8 +;;   (let [movie (File. render-dir "final.ogg")
     2.9 +;;         final-audio (File. render-dir "final.wav")
    2.10 +;;         final (File. render-dir "final")]
    2.11 +;;     (.delete movie)
    2.12 +;;     (.delete final-audio)
    2.13 +;;     (clojure.java.shell/sh
    2.14 +;;      "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
    2.15 +;;      (.getCanonicalPath final-audio))
    2.16 +;;     (clojure.java.shell/sh
    2.17 +;;      "ffmpeg" "-r" "60" ;; maybe 59.7 ???!
    2.18 +;;      "-i" (str (.getCanonicalPath final) "/" "%07d.bmp")
    2.19 +;;      "-i" (.getCanonicalPath final-audio)
    2.20 +;;      "-b:a" "128k"
    2.21 +;;      "-b:v" "9000k"
    2.22 +;;      "-c:a" "libvorbis"
    2.23 +;;      "-f"   "webm"
    2.24 +;;      "-g"   "200"
    2.25 +;;      (.getCanonicalPath movie)) nil))
    2.26 +
    2.27  (defn final-cut! [^File render-dir]
    2.28    (let [movie (File. render-dir "final.ogg")
    2.29          final-audio (File. render-dir "final.wav")
    2.30 @@ -165,16 +185,17 @@
    2.31       "sox" (.getCanonicalPath (File. render-dir "audio.wav"))
    2.32       (.getCanonicalPath final-audio))
    2.33      (clojure.java.shell/sh
    2.34 -     "ffmpeg" "-r" "60" ;; maybe 59.7 ???!
    2.35 +     "ffmpeg"
    2.36 +     "-framerate" "60" 
    2.37       "-i" (str (.getCanonicalPath final) "/" "%07d.bmp")
    2.38       "-i" (.getCanonicalPath final-audio)
    2.39       "-b:a" "128k"
    2.40       "-b:v" "9000k"
    2.41       "-c:a" "libvorbis"
    2.42 -     "-f"   "webm"
    2.43 -     "-g"   "200"
    2.44 +     "-c:v" "libtheora"
    2.45 +     "-r" "60"
    2.46       (.getCanonicalPath movie)) nil))
    2.47 -     
    2.48 +
    2.49    
    2.50  (comment
    2.51