Always fire JitsiConferenceEvents.TRACK_REMOVED event when track is removed when participant lefts the conference

JitsiConference.js

@@ -628,7 +628,11 @@ JitsiConference.prototype.onMemberLeft = function (jid) {
     var participant = this.participants[id];
     delete this.participants[id];
 
-    this.rtc.removeRemoteTracks(id);
+    var removedTracks = this.rtc.removeRemoteTracks(id);
+
+    removedTracks.forEach(function (track) {
+        this.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
+    }.bind(this));
 
     this.eventEmitter.emit(JitsiConferenceEvents.USER_LEFT, id, participant);
 };
@@ -1122,8 +1126,15 @@ function setupListeners(conference) {
                         && tracks[i].getStreamId() == streamId
                         && tracks[i].getTrackId() == trackId) {
                         var track = participant._tracks.splice(i, 1)[0];
-                        conference.eventEmitter.emit(
-                            JitsiConferenceEvents.TRACK_REMOVED, track);
+
+                        track = conference.rtc.removeRemoteTrack(
+                            participant.getId(), track);
+
+                        if (track) {
+                            conference.eventEmitter.emit(
+                                JitsiConferenceEvents.TRACK_REMOVED, track);
+                        }
+
                         return;
                     }
                 }

modules/RTC/RTC.js

@@ -287,18 +287,57 @@ RTC.prototype.createRemoteTrack = function (event) {
 
 /**
  * Removes all JitsiRemoteTracks associated with given MUC nickname (resource
- * part of the JID).
- * @param resource the resource part of the MUC JID
- * @returns {JitsiRemoteTrack|null}
+ * part of the JID). Returns array of removed tracks.
+ *
+ * @param {string} resource - The resource part of the MUC JID.
+ * @returns {JitsiRemoteTrack[]}
  */
 RTC.prototype.removeRemoteTracks = function (resource) {
-    var remoteTracks = this.remoteTracks[resource];
+    var remoteTracksForResource = this.remoteTracks[resource];
+    var removedTracks = [];
+
+    if (remoteTracksForResource) {
+        for (var key in remoteTracksForResource) {
+            if (remoteTracksForResource.hasOwnProperty(key) &&
+                remoteTracksForResource[key]) {
+                var removedTrack = this.removeRemoteTrack(
+                    resource, remoteTracksForResource[key]);
+
+                if (removedTrack) {
+                    removedTracks.push(removedTrack);
+                }
+            }
+        }
 
-    if(remoteTracks) {
-        remoteTracks['audio'] && remoteTracks['audio'].dispose();
-        remoteTracks['video'] && remoteTracks['video'].dispose();
         delete this.remoteTracks[resource];
     }
+
+    return removedTracks;
+};
+
+/**
+ * Removes specified JitsiRemoteTrack associated with given MUC nickname
+ * (resource part of the JID). Returns removed track if any.
+ *
+ * @param {string} resource - The resource part of the MUC JID.
+ * @param {JitsiRemoteTrack} track - Track to remove.
+ * @returns {JitsiRemoteTrack|undefined}
+ */
+RTC.prototype.removeRemoteTrack = function (resource, track) {
+    var remoteTracksForResource = this.remoteTracks[resource];
+
+    if (remoteTracksForResource) {
+        for (var key in remoteTracksForResource) {
+            if (remoteTracksForResource.hasOwnProperty(key) &&
+                remoteTracksForResource[key] &&
+                remoteTracksForResource[key] === track) {
+                remoteTracksForResource[key].dispose();
+                delete remoteTracksForResource[key];
+                return track;
+            }
+
+        }
+    }
 };
 
 RTC.getPCConstraints = function () {