From 207481ffbdd0c4d6be67758ea99a854ec3c400b3 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Wed, 8 Jan 2014 21:49:04 +0000
Subject: [PATCH] * audiomixer move

---
 ruby/lib/jam_ruby.rb                   |  1 +
 ruby/lib/jam_ruby/lib/audiomixer.rb    | 21 -----------------
 ruby/lib/jam_ruby/resque/audiomixer.rb | 32 ++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 21 deletions(-)
 delete mode 100644 ruby/lib/jam_ruby/lib/audiomixer.rb
 create mode 100644 ruby/lib/jam_ruby/resque/audiomixer.rb

diff --git a/ruby/lib/jam_ruby.rb b/ruby/lib/jam_ruby.rb
index 1f16a8104..306042a5a 100755
--- a/ruby/lib/jam_ruby.rb
+++ b/ruby/lib/jam_ruby.rb
@@ -27,6 +27,7 @@ require "jam_ruby/lib/module_overrides"
 require "jam_ruby/lib/s3_util"
 require "jam_ruby/lib/s3_manager"
 require "jam_ruby/lib/profanity"
+require "jam_ruby/resque/audiomixer"
 require "jam_ruby/mq_router"
 require "jam_ruby/base_manager"
 require "jam_ruby/connection_manager"
diff --git a/ruby/lib/jam_ruby/lib/audiomixer.rb b/ruby/lib/jam_ruby/lib/audiomixer.rb
deleted file mode 100644
index 2efc0c955..000000000
--- a/ruby/lib/jam_ruby/lib/audiomixer.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'json'
-require 'resque'
-
-module JamRuby
-
-  @queue = :audiomixer
-
-  class AudioMixer
-
-    def self.perform(manifest)
-      tmp = Dir::Tmpname.make_tmpname "/var/tmp/audiomixer/manifest-#{manifest['recordingId']}", nil
-      File.open(tmp,"w") do |f|
-        f.write(manifest.to_json)
-      end
-
-      system("tar zxvf some_big_tarball.tar.gz"))
-    end
-
-  end
-
-end
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/resque/audiomixer.rb b/ruby/lib/jam_ruby/resque/audiomixer.rb
new file mode 100644
index 000000000..209351d4b
--- /dev/null
+++ b/ruby/lib/jam_ruby/resque/audiomixer.rb
@@ -0,0 +1,32 @@
+require 'json'
+require 'resque'
+
+module JamRuby
+
+  @queue = :audiomixer
+
+  class AudioMixer
+
+    def self.perform(manifest)
+      audiomixer = AudioMixer.new
+      audiomixer.run(manifest)
+
+    end
+
+    def run(manifest)
+      manifest_file = Dir::Tmpname.make_tmpname "/var/tmp/audiomixer/manifest-#{manifest['recordingId']}", nil
+      File.open(manifest_file,"w") do |f|
+        f.write(manifest.to_json)
+      end
+
+      #{"files": [{"codec": "vorbis", "offset": 0, "filename": "TPD - bass.flac-stereo.ogg"}, {"codec": "vorbis", "offset": 0, "filename": "TPD - bg vox.flac-stereo.ogg"}, {"codec": "vorbis", "offset": 0, "filename": "TPD - drums.flac-stereo.ogg"}, {"codec": "vorbis", "offset": 0, "filename": "TPD - guitars.flac-stereo.ogg"}, {"codec": "vorbis", "offset": 0, "filename": "TPD - lead vox.flac-stereo.ogg"}], "output": {"codec": "vorbis", "filename": "mix.ogg"}, "timeline": [{"timestamp": 0, "mix": [{"balance": 0, "level": 100}, {"balance": 0, "level": 100}, {"balance": 0, "level": 100}, {"balance": 0, "level": 100}, {"balance": 0, "level": 100}]}]}
+
+      path = "/var/lib/audiomixer/audiomixer/audiomixerapp"
+
+      system("tar zxvf some_big_tarball.tar.gz"))
+
+    end
+
+  end
+
+end
\ No newline at end of file