Sfoglia il codice sorgente

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

j8
paweldomas 12 anni fa
parent
commit
a2633e20e8

+ 0
- 4
libs/colibri/colibri.focus.js Vedi File

102
         */
102
         */
103
     };
103
     };
104
     this.peerconnection.onaddstream = function (event) {
104
     this.peerconnection.onaddstream = function (event) {
105
-        self.remoteStream = event.stream;
106
         // search the jid associated with this stream
105
         // search the jid associated with this stream
107
         Object.keys(self.remotessrc).forEach(function (jid) {
106
         Object.keys(self.remotessrc).forEach(function (jid) {
108
             if (self.remotessrc[jid].join('\r\n').indexOf('mslabel:' + event.stream.id) != -1) {
107
             if (self.remotessrc[jid].join('\r\n').indexOf('mslabel:' + event.stream.id) != -1) {
109
                 event.peerjid = jid;
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
         $(document).trigger('remotestreamadded.jingle', [event, self.sid]);
111
         $(document).trigger('remotestreamadded.jingle', [event, self.sid]);

+ 5
- 4
libs/strophe/strophe.jingle.session.js Vedi File

22
         console.error(e);
22
         console.error(e);
23
     }
23
     }
24
 
24
 
25
-    this.remoteStream = null;
26
     this.localSDP = null;
25
     this.localSDP = null;
27
     this.remoteSDP = null;
26
     this.remoteSDP = null;
28
     this.localStreams = [];
27
     this.localStreams = [];
69
         self.sendIceCandidate(event.candidate);
68
         self.sendIceCandidate(event.candidate);
70
     };
69
     };
71
     this.peerconnection.onaddstream = function (event) {
70
     this.peerconnection.onaddstream = function (event) {
72
-        self.remoteStream = event.stream;
73
         self.remoteStreams.push(event.stream);
71
         self.remoteStreams.push(event.stream);
74
         $(document).trigger('remotestreamadded.jingle', [event, self.sid]);
72
         $(document).trigger('remotestreamadded.jingle', [event, self.sid]);
75
     };
73
     };
76
     this.peerconnection.onremovestream = function (event) {
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
         // FIXME: remotestreamremoved.jingle not defined anywhere(unused)
80
         // FIXME: remotestreamremoved.jingle not defined anywhere(unused)
80
         $(document).trigger('remotestreamremoved.jingle', [event, self.sid]);
81
         $(document).trigger('remotestreamremoved.jingle', [event, self.sid]);
81
     };
82
     };

Loading…
Annulla
Salva