Moves the code that trigger TRACK_REMOVED events for remote track to use peerconnection event instead of relying on TRACK_STOPPED event.

JitsiConference.js

@@ -582,17 +582,6 @@ JitsiConference.prototype.onTrackAdded = function (track) {
     participant._tracks.push(track);
 
     var emitter = this.eventEmitter;
-    track.addEventListener(
-        JitsiTrackEvents.TRACK_STOPPED,
-        function () {
-            // remove track from JitsiParticipant
-            var pos = participant._tracks.indexOf(track);
-            if (pos > -1) {
-                participant._tracks.splice(pos, 1);
-            }
-            emitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
-        }
-    );
     track.addEventListener(
         JitsiTrackEvents.TRACK_MUTE_CHANGED,
         function () {
@@ -870,6 +859,24 @@ function setupListeners(conference) {
             }
         }
     );
+    conference.room.addListener(XMPPEvents.REMOTE_STREAM_REMOVED,
+        function (streamId) {
+            var participants = conference.getParticipants();
+            for(var j = 0; j < participants.length; j++) {
+                var participant = participants[j];
+                var tracks = participant.getTracks();
+                for(var i = 0; i < tracks.length; i++) {
+                    if(tracks[i] && tracks[i].stream &&
+                        RTC.getStreamID(tracks[i].stream) == streamId){
+                        var track = participant._tracks.splice(i, 1);
+                        conference.eventEmitter.emit(
+                            JitsiConferenceEvents.TRACK_REMOVED, track);
+                        return;
+                    }
+                }
+            }
+        }
+    );
     conference.rtc.addListener(RTCEvents.FAKE_VIDEO_TRACK_CREATED,
         function (track) {
             conference.onTrackAdded(track);

modules/xmpp/JingleSessionPC.js

@@ -128,9 +128,16 @@ JingleSessionPC.prototype.doInitialize = function () {
     };
     this.peerconnection.onremovestream = function (event) {
         // Remove the stream from remoteStreams
-        // FIXME: remotestreamremoved.jingle not defined anywhere(unused)
-
-        $(document).trigger('remotestreamremoved.jingle', [event, self.sid]);
+        if (event.stream.id !== 'default') {
+            logger.log("REMOTE STREAM REMOVED: ", event.stream , event.stream.id);
+            self.remoteStreamRemoved(event);
+        } else {
+            // This is a recvonly stream. Clients that implement Unified Plan,
+            // such as Firefox use recvonly "streams/channels/tracks" for
+            // receiving remote stream/tracks, as opposed to Plan B where there
+            // are only 3 channels: audio, video and data.
+            logger.log("RECVONLY REMOTE STREAM IGNORED: " + event.stream + " - " + event.stream.id);
+        }
     };
     this.peerconnection.onsignalingstatechange = function (event) {
         if (!(self && self.peerconnection)) return;
@@ -1381,6 +1388,20 @@ JingleSessionPC.prototype.remoteStreamAdded = function (data, times) {
     }
 }
 
+/**
+ * Handles remote stream removal.
+ * @param event The event object associated with the removal.
+ */
+JingleSessionPC.prototype.remoteStreamRemoved = function (event) {
+    var thessrc;
+    var streamId = RTC.getStreamID(event.stream);
+    if (!streamId) {
+        logger.error("No stream ID for", event.stream);
+    } else if (streamId && streamId.indexOf('mixedmslabel') === -1) {
+        this.room.eventEmitter.emit(XMPPEvents.REMOTE_STREAM_REMOVED, streamId);
+    }
+}
+
 /**
  * Returns the ice connection state for the peer connection.
  * @returns the ice connection state for the peer connection.

service/xmpp/XMPPEvents.js

@@ -85,6 +85,10 @@ var XMPPEvents = {
     READY_TO_JOIN: 'xmpp.ready_to_join',
     FOCUS_LEFT: "xmpp.focus_left",
     REMOTE_STREAM_RECEIVED: "xmpp.remote_stream_received",
+    /**
+     * Indicates that remote stream has been removed from the conference.
+     */
+    REMOTE_STREAM_REMOVED: "xmpp.remote_stream_removed",
     /**
      * Indicates that recording state changed.
      */