Procházet zdrojové kódy

Removes unused remoteStream variable. Fixes stream removal from remoteStreams array.

master
paweldomas před 11 roky
rodič
revize
a2633e20e8

+ 0
- 4
libs/colibri/colibri.focus.js Zobrazit soubor

@@ -102,14 +102,10 @@ ColibriFocus.prototype.makeConference = function (peers) {
102 102
         */
103 103
     };
104 104
     this.peerconnection.onaddstream = function (event) {
105
-        self.remoteStream = event.stream;
106 105
         // search the jid associated with this stream
107 106
         Object.keys(self.remotessrc).forEach(function (jid) {
108 107
             if (self.remotessrc[jid].join('\r\n').indexOf('mslabel:' + event.stream.id) != -1) {
109 108
                 event.peerjid = jid;
110
-                if (self.connection.jingle.jid2session[jid]) {
111
-                    self.connection.jingle.jid2session[jid].remotestream = event.stream;
112
-                }
113 109
             }
114 110
         });
115 111
         $(document).trigger('remotestreamadded.jingle', [event, self.sid]);

+ 5
- 4
libs/strophe/strophe.jingle.session.js Zobrazit soubor

@@ -22,7 +22,6 @@ function JingleSession(me, sid, connection) {
22 22
         console.error(e);
23 23
     }
24 24
 
25
-    this.remoteStream = null;
26 25
     this.localSDP = null;
27 26
     this.remoteSDP = null;
28 27
     this.localStreams = [];
@@ -69,13 +68,15 @@ JingleSession.prototype.initiate = function (peerjid, isInitiator) {
69 68
         self.sendIceCandidate(event.candidate);
70 69
     };
71 70
     this.peerconnection.onaddstream = function (event) {
72
-        self.remoteStream = event.stream;
73 71
         self.remoteStreams.push(event.stream);
74 72
         $(document).trigger('remotestreamadded.jingle', [event, self.sid]);
75 73
     };
76 74
     this.peerconnection.onremovestream = function (event) {
77
-        self.remoteStream = null;
78
-        // FIXME: remove from this.remoteStreams
75
+        // Remove the stream from remoteStreams
76
+        var streamIdx = self.remoteStreams.indexOf(event.stream);
77
+        if(streamIdx !== -1){
78
+            self.remoteStreams.splice(streamIdx, 1);
79
+        }
79 80
         // FIXME: remotestreamremoved.jingle not defined anywhere(unused)
80 81
         $(document).trigger('remotestreamremoved.jingle', [event, self.sid]);
81 82
     };

Načítá se…
Zrušit
Uložit