VideoWaiter should notify if it's retriggering

static/js/directives/audiovideo.js

@@ -146,7 +146,7 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
 							var video = clonedElement.find("video")[0];
 							$window.attachMediaStream(video, stream);
 							// Waiter callbacks also count as connected, as browser support (FireFox 25) is not setting state changes properly.
-							videoWaiter.wait(video, stream, function(withvideo) {
+							videoWaiter.wait(video, stream, function(withvideo, retriggered) {
 								if (scope.destroyed) {
 									console.log("Abort wait for video on destroyed scope.");
 									return;
@@ -163,7 +163,9 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
 										$scope.onlyaudio = true;
 									});
 								}
-								scope.$emit("active", currentcall);
+								if (!retriggered) {
+									scope.$emit("active", currentcall);
+								}
 								$scope.redraw();
 							}, function() {
 								if (scope.destroyed) {

static/js/services/videowaiter.js

@@ -24,25 +24,44 @@ define(["underscore"], function(_) {
 
 	return ["$window", function($window) {
 
-		var Waiter = function() {
+		var Waiter = function(video, stream, cb, err_cb) {
 			this.stop = false;
+			this.triggered = false;
 			this.count = 0;
 			this.retries = 100;
+
+			this.video = video;
+			this.stream = stream;
+			this.cb = cb;
+			this.err_cb = err_cb;
+		};
+		Waiter.prototype.trigger = function() {
+			var oldTriggered = this.triggered;
+			this.triggered = true;
+			return oldTriggered;
+		};
+		Waiter.prototype.error = function() {
+			var triggered = this.trigger();
+			if (this.err_cb) {
+				this.err_cb(this.video, this.stream, triggered);
+			}
 		};
-		Waiter.prototype.start = function(video, stream, cb, err_cb) {
+		Waiter.prototype.found = function(withvideo) {
+			var triggered = this.trigger();
+			this.cb(withvideo, triggered);
+		};
+		Waiter.prototype.start = function() {
 			if (this.stop) {
-				if (err_cb) {
-					err_cb(video, stream);
-				}
+				this.error();
 				return;
 			}
-			var recheck = _.bind(this.start, this, video, stream, cb, err_cb);
-			var videoTracks = stream && stream.getVideoTracks() || [];
+			var recheck = _.bind(this.start, this);
+			var videoTracks = this.stream && this.stream.getVideoTracks() || [];
 			//console.log("wait for video", videoTracks.length, video.currentTime, video.videoHeight, video);
 			if (videoTracks.length === 0 && this.count >= 10) {
-				cb(false, video, stream);
-			} else if (video.currentTime > 0 && video.videoHeight > 0) {
-				cb(true, video, stream);
+				this.found(false);
+			} else if (this.video.currentTime > 0 && this.video.videoHeight > 0) {
+				this.found(true);
 			} else {
 				if (videoTracks.length > 0 && this.count >= 10) {
 					var videoTrack = videoTracks[0];
@@ -51,7 +70,7 @@ define(["underscore"], function(_) {
 							videoTrack.onunmute = undefined;
 							_.defer(recheck);
 						};
-						cb(false, video, stream);
+						this.found(false);
 						return;
 					}
 				}
@@ -59,9 +78,7 @@ define(["underscore"], function(_) {
 				if (this.count < this.retries) {
 					$window.setTimeout(recheck, 100);
 				} else {
-					if (err_cb) {
-						err_cb(video, stream);
-					}
+					this.error();
 				}
 			}
 		};
@@ -72,15 +89,16 @@ define(["underscore"], function(_) {
 		// videoWaiter wait
 		return {
 			wait: function(video, stream, cb, err_cb) {
-				var waiter = new Waiter();
+				var waiter = new Waiter(video, stream, cb, err_cb);
 				_.defer(function() {
-					waiter.start(video, stream, cb, err_cb);
+					waiter.start();
 				});
-				return waiter;
+				return {
+					stop: waiter.stop,
+				};
 			}
 		}
 
 	}]
 
-
 });