|
@@ -43,10 +43,9 @@ function RTC(room, options) {
|
43
|
43
|
this.options = options || {};
|
44
|
44
|
room.addPresenceListener("videomuted", function (values, from) {
|
45
|
45
|
var videoTrack = self.getRemoteVideoTrack(from);
|
46
|
|
- if (!videoTrack) {
|
47
|
|
- return;
|
|
46
|
+ if (videoTrack) {
|
|
47
|
+ videoTrack.setMute(values.value == "true");
|
48
|
48
|
}
|
49
|
|
- videoTrack.setMute(values.value == "true");
|
50
|
49
|
});
|
51
|
50
|
room.addPresenceListener("audiomuted", function (values, from) {
|
52
|
51
|
var audioTrack = self.getRemoteAudioTrack(from);
|
|
@@ -242,21 +241,26 @@ RTC.prototype.removeLocalTrack = function (track) {
|
242
|
241
|
}
|
243
|
242
|
};
|
244
|
243
|
|
|
244
|
+/**
|
|
245
|
+ * Initializes a new JitsiRemoteTrack instance with the data provided by (a)
|
|
246
|
+ * ChatRoom to XMPPEvents.REMOTE_TRACK_ADDED.
|
|
247
|
+ *
|
|
248
|
+ * @param {Object} event the data provided by (a) ChatRoom to
|
|
249
|
+ * XMPPEvents.REMOTE_TRACK_ADDED to (a)
|
|
250
|
+ */
|
245
|
251
|
RTC.prototype.createRemoteTrack = function (event) {
|
246
|
252
|
var ownerJid = event.owner;
|
247
|
253
|
var remoteTrack = new JitsiRemoteTrack(
|
248
|
254
|
this, ownerJid, event.stream, event.track,
|
249
|
255
|
event.mediaType, event.videoType, event.ssrc, event.muted);
|
250
|
256
|
var resource = Strophe.getResourceFromJid(ownerJid);
|
251
|
|
- if(!this.remoteTracks[resource]) {
|
252
|
|
- this.remoteTracks[resource] = {};
|
253
|
|
- }
|
|
257
|
+ var remoteTracks
|
|
258
|
+ = this.remoteTracks[resource] || (this.remoteTracks[resource] = {});
|
254
|
259
|
var mediaType = remoteTrack.getType();
|
255
|
|
- if (this.remoteTracks[resource][mediaType]) {
|
256
|
|
- logger.warn(
|
257
|
|
- "Overwriting remote track !", resource, mediaType);
|
|
260
|
+ if (remoteTracks[mediaType]) {
|
|
261
|
+ logger.warn("Overwriting remote track!", resource, mediaType);
|
258
|
262
|
}
|
259
|
|
- this.remoteTracks[resource][mediaType] = remoteTrack;
|
|
263
|
+ remoteTracks[mediaType] = remoteTrack;
|
260
|
264
|
return remoteTrack;
|
261
|
265
|
};
|
262
|
266
|
|