haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #522 from jitsi/fix_lib_rename 

Fixes the compatability with lib-jitsi-meet for TRACK_REMOVED events for remote track to use peerconnection event instead of relying on TRACK_STOPPED event.
This commit is contained in:
damencho 2016-03-07 11:22:22 -06:00
parent 25a9928758 30e1e3b23a
commit 6b5a52926a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conference.js
View File

@ -539,7 +539,7 @@ export default {
if (localVideo) { if (localVideo) {
// this calls room.removeTrack internally // this calls room.removeTrack internally
// so we don't need to remove it manually // so we don't need to remove it manually
promise = localVideo.stop(); promise = localVideo.dispose();
} }
localVideo = stream; localVideo = stream;
@ -575,7 +575,7 @@ export default {
if (localAudio) { if (localAudio) {
// this calls room.removeTrack internally // this calls room.removeTrack internally
// so we don't need to remove it manually // so we don't need to remove it manually
promise = localAudio.stop(); promise = localAudio.dispose();
} }
localAudio = stream; localAudio = stream;
@ -612,7 +612,7 @@ export default {
if (shareScreen) { if (shareScreen) {
createDesktopTrack().then(([stream]) => { createDesktopTrack().then(([stream]) => {
stream.on( stream.on(
TrackEvents.TRACK_STOPPED, TrackEvents.LOCAL_TRACK_STOPPED,
() => { () => {
// if stream was stopped during screensharing session // if stream was stopped during screensharing session
// then we should switch to video // then we should switch to video

4
modules/UI/videolayout/LocalVideo.js
View File

@ -193,9 +193,9 @@ LocalVideo.prototype.changeVideo = function (stream) {
let endedHandler = () => { let endedHandler = () => {
localVideoContainer.removeChild(localVideo); localVideoContainer.removeChild(localVideo);
this.VideoLayout.updateRemovedVideo(this.id); this.VideoLayout.updateRemovedVideo(this.id);
stream.off(TrackEvents.TRACK_STOPPED, endedHandler); stream.off(TrackEvents.LOCAL_TRACK_STOPPED, endedHandler);
}; };
stream.on(TrackEvents.TRACK_STOPPED, endedHandler); stream.on(TrackEvents.LOCAL_TRACK_STOPPED, endedHandler);
}; };
export default LocalVideo; export default LocalVideo;