Camera: further simplication

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
tessel · Mar 17, 2016 · acff491 · acff491
1 parent 31ffce0
commit acff491
Showing 1 changed file with 13 additions and 21 deletions.
diff --git a/lib/camera.js b/lib/camera.js
@@ -26,18 +26,21 @@ CaptureStream.prototype = Object.create(Readable.prototype, {
   }
 });
 
+var cameraDefaults = {
+  width: 320,
+  height: 240,
+  // 0-1 fractional percent. 1 => best, 0 => worst.
+  // maps to: ffmpeg -q:v 1-30 (Lower number is better)
+  quality: 1,
+  path: '/dev/video0',
+  stream: false,
+  pipe: true,
+};
+
 function Camera(options) {
   Emitter.call(this);
 
-  options = options || {};
-
-  if (typeof options.stream === 'undefined') {
-    options.stream = false;
-  }
-
-  if (typeof options.pipe === 'undefined') {
-    options.pipe = true;
-  }
+  options = Object.assign({}, cameraDefaults, options || {});
 
   var state = {
     isStreaming: false,
@@ -180,18 +183,7 @@ Camera.prototype.stream = function() {
   });
 };
 
-var cameraDefaults = {
-  width: 320,
-  height: 240,
-  // 0-1 fractional percent. 1 => best, 0 => worst.
-  // maps to: ffmpeg -q:v 1-30 (Lower number is better)
-  quality: 1,
-  path: '/dev/video0',
-};
-
-module.exports = function(options) {
-  return new Camera(Object.assign({}, cameraDefaults, options || {}));
-};
+module.exports = Camera;
 
 if (global.IS_TEST_ENV) {
   module.exports.CaptureStream = CaptureStream;