summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2013-12-18 21:37:53 -0500
committerJulie Lala <jules@okfoc.us>2013-12-18 21:37:53 -0500
commitb3b2284ee4fbdd979c4e04c3d7605ff58d873938 (patch)
tree943fc0af2f10002fff33754a7ec3279b7fb37a90
parent5ef224e2a9b37d4b5b283d5bf5ebd4f5d0ec226b (diff)
concatenated files
-rw-r--r--.gitignore1
-rw-r--r--js/gif-encode/client.js8
-rw-r--r--js/gif-encode/worker.js2
3 files changed, 3 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 1787d3b..965bdd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ v1
.sass-cache/
.#*
*.swp
+node_modules
diff --git a/js/gif-encode/client.js b/js/gif-encode/client.js
index 271cbb0..e85c0e7 100644
--- a/js/gif-encode/client.js
+++ b/js/gif-encode/client.js
@@ -1,9 +1,3 @@
-// Total frames to record
-var FRAMES_PER_GIF = 36;
-
-// Frames per second to read from the video
-var FPS = 12;
-
// Per-frame delay in milliseconds
var DELAY = Math.floor( 1000 / FPS );
@@ -113,7 +107,7 @@ function GifEncoder(){
var ww = [];
base.init = function(){
for (var i = 0; i < WORKERS; i++) {
- var worker = new Worker('js/vendor/gif-encode/worker.js');
+ var worker = new Worker('http://asdf.us/gif-recorder/js/gif-encode/worker.concat.js');
worker.onmessage = base.receiveWork;
ww.push(worker);
}
diff --git a/js/gif-encode/worker.js b/js/gif-encode/worker.js
index b2f32d4..e4a5ee5 100644
--- a/js/gif-encode/worker.js
+++ b/js/gif-encode/worker.js
@@ -1,4 +1,4 @@
-importScripts('LZWEncoder.js', 'NeuQuant.js', 'GIFEncoder.js');
+// importScripts('LZWEncoder.js', 'NeuQuant.js', 'GIFEncoder.js');
self.onmessage = function(event) {
var data = event.data;