added auth-done debug notify

infusion · Oct 13, 2010 · a0dddc8 · a0dddc8
1 parent e6d76d3
commit a0dddc8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/jquery.webcam.js b/jquery.webcam.js
@@ -14,7 +14,8 @@
 
     var webcam = {
 
-	id: null,
+	extern: null, // external select token to support jQuery dialogs
+	append: true, // append object instead of overwriting
 
 	width: 320,
 	height: 240,
@@ -37,25 +38,25 @@
 
 	if (typeof options === "object") {
 	    for (var ndx in webcam) {
-		if (typeof options[ndx] !== "undefined") {
+		if (options[ndx] !== undefined) {
 		    webcam[ndx] = options[ndx];
 		}
 	    }
 	}
 
-	var source = '<object id="webcam-object" type="application/x-shockwave-flash" data="'+webcam.swffile+'" width="'+webcam.width+'" height="'+webcam.height+'"><param name="movie" value="'+webcam.swffile+'" /><param name="FlashVars" value="mode='+webcam.mode+'&amp;quality='+webcam.quality+'" /></object>';
+	var source = '<object id="XwebcamXobjectX" type="application/x-shockwave-flash" data="'+webcam.swffile+'" width="'+webcam.width+'" height="'+webcam.height+'"><param name="movie" value="'+webcam.swffile+'" /><param name="FlashVars" value="mode='+webcam.mode+'&amp;quality='+webcam.quality+'" /></object>';
 
-	if (null !== webcam.id) {
-	    $('#' + webcam.id).html(source);
+	if (null !== webcam.extern) {
+	    $(webcam.extern)[webcam.append ? "append" : "html"](source);
 	} else {
-	    this.append(source);
+	    this[webcam.append ? "append" : "html"](source);
 	}
 
 	(_register = function(run) {
 
-	    var cam = document.getElementById('webcam-object');
+	    var cam = document.getElementById('XwebcamXobjectX');
 
-	    if (typeof cam.capture !== "undefined") {
+	    if (cam.capture !== undefined) {
 
 		/* Simple callback methods are not allowed :-/ */
 		webcam.capture = function(x) {

diff --git a/jscam.swf b/jscam.swf
diff --git a/jscam_canvas_only.swf b/jscam_canvas_only.swf
diff --git a/src/jscam.as b/src/jscam.as
@@ -54,6 +54,19 @@ class JSCam {
 
 		if (null != camera) {
 
+			// http://www.adobe.com/support/flash/action_scripts/actionscript_dictionary/actionscript_dictionary133.html
+			camera.onStatus = function(info:Object) {
+
+			    switch (info.code) {
+			    case 'Camera.Muted':
+				ExternalInterface.call('webcam.debug', "notify", "Camera stopped");
+				break;
+			    case 'Camera.Unmuted' :
+				ExternalInterface.call('webcam.debug', "notify", "Camera started");
+				break;
+			    }
+			}
+
 			camera.setQuality(0, 100);
 			camera.setMode(Stage.width, Stage.height, 24, false);
 
@@ -83,7 +96,7 @@ class JSCam {
 			}
 
 			buffer = new BitmapData(Stage.width, Stage.height);
-			ExternalInterface.call('webcam.debug', "notify", "Capturing started." + mode);
+			ExternalInterface.call('webcam.debug', "notify", "Capturing started.");
 
 			if ("stream" == mode) {
 				_stream();