summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGubolin <gubolin@fantasymail.de>2014-08-17 18:44:47 +0200
committerGubolin <gubolin@fantasymail.de>2014-08-17 18:44:47 +0200
commitd3be78cbedce2d9990c1efe6abf304dde69ba19a (patch)
tree72de4fd1700aa0f43434335f744454d94e32228e
parent48ace3a975d39bbaa2f74ec07d521dc723903371 (diff)
downloadsnap-d3be78cbedce2d9990c1efe6abf304dde69ba19a.tar.gz
snap-d3be78cbedce2d9990c1efe6abf304dde69ba19a.zip
improve camera block error handling
-rw-r--r--threads.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/threads.js b/threads.js
index 2d03fc7..eda8fc7 100644
--- a/threads.js
+++ b/threads.js
@@ -2778,6 +2778,11 @@ Process.prototype.doStreamCamera = function () {
stage.trailsCanvas = newCanvas(stage.dimensions);
}
+ error = function (msg) {
+ var err = { name: 'Camera', message: msg };
+ myself.handleError(err);
+ };
+
stage.streamingCamera = false;
if (video === null) {
@@ -2799,7 +2804,9 @@ Process.prototype.doStreamCamera = function () {
window.URL_ = window.URL || window.webkitURL;
video.src = window.URL_.createObjectURL(stream);
video.play();
- }, this.handleError); // TODO: improve error handling
+ }, error);
+ } else {
+ error('getUserMedia not supported');
}
stage.lastCameraCanvas = newCanvas(stage.dimensions);
} else {