Merge pull request #230 from jitsi/fix_ended_handler

Fixes onended handler issues

modules/RTC/JitsiLocalTrack.js

@@ -206,7 +206,6 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
         this.isAudioTrack() ||
         this.videoType === VideoType.DESKTOP ||
         RTCBrowserType.isFirefox()) {
-
         if(this.track)
             this.track.enabled = !mute;
     } else {
@@ -218,7 +217,7 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
                     //FIXME: Maybe here we should set the SRC for the containers
                     // to something
                     RTCUtils.stopMediaStream(self.stream);
-                    self.stream = null;
+                    self._setStream(null);
                 });
         } else {
             // This path is only for camera.
@@ -240,7 +239,7 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
                         throw new JitsiTrackError(
                             JitsiTrackErrors.TRACK_NO_STREAM_FOUND);
                     }else {
-                        self.stream = streamInfo.stream;
+                        self._setStream(streamInfo.stream);
                         self.track = streamInfo.track;
                         // This is not good when video type changes after
                         // unmute, but let's not crash here

modules/RTC/JitsiTrack.js

@@ -70,6 +70,7 @@ function JitsiTrack(conference, stream, track, streamInactiveHandler, trackMedia
     this.type = trackMediaType;
     this.track = track;
     this.videoType = videoType;
+    this.handlers = {};
 
     /**
      * Indicates whether this JitsiTrack has been disposed. If true, this
@@ -79,13 +80,38 @@ function JitsiTrack(conference, stream, track, streamInactiveHandler, trackMedia
      * @type {boolean}
      */
     this.disposed = false;
+    this._setHandler("inactive", streamInactiveHandler);
+}
 
-    if(stream) {
-        if (RTCBrowserType.isFirefox()) {
-            implementOnEndedHandling(this);
+/**
+ * Sets handler to the WebRTC MediaStream or MediaStreamTrack object depending
+ * on the passed type.
+ * @param {string} type the type of the handler that is going to be set
+ * @param {Function} handler the handler.
+ */
+JitsiTrack.prototype._setHandler = function (type, handler) {
+    if(this.stream) {
+        if(type === "inactive") {
+            if (RTCBrowserType.isFirefox()) {
+                implementOnEndedHandling(this);
+            }
+            addMediaStreamInactiveHandler(this.stream, handler);
         }
-        addMediaStreamInactiveHandler(stream, streamInactiveHandler);
     }
+    this.handlers[type] = handler;
+}
+
+/**
+ * Sets the stream property of JitsiTrack object and sets all stored handlers
+ * to it.
+ * @param {MediaStream} stream the new stream.
+ */
+JitsiTrack.prototype._setStream = function (stream) {
+    this.stream = stream;
+    Object.keys(this.handlers).forEach(function (type) {
+        typeof(this.handlers[type]) === "function" &&
+            this._setHandler(type, this.handlers[type]);
+    }, this);
 }
 
 /**