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

Fixes start muted. Adds the local track before the conference is joined.

This commit is contained in:
hristoterezov 2016-01-12 21:38:58 -06:00
parent 78c4c11736
commit f8c12304dc
2 changed files with 570 additions and 899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
conference.js
View File

@ -225,10 +225,10 @@ export default {
return room.getParticipants().length + 1; return room.getParticipants().length + 1;
}, },
get startAudioMuted () { get startAudioMuted () {
return room && room.isStartAudioMuted(); return room && room.getStartMutedPolicy().audio;
}, },
get startVideoMuted () { get startVideoMuted () {
return room && room.isStartVideoMuted(); return room && room.getStartMutedPolicy().video;
}, },
// used by torture currently // used by torture currently
isJoined () { isJoined () {
@ -246,6 +246,16 @@ export default {
_createRoom () { _createRoom () {
room = connection.initJitsiConference(APP.conference.roomName, room = connection.initJitsiConference(APP.conference.roomName,
this._getConferenceOptions()); this._getConferenceOptions());
localTracks.forEach((track) => {
if(track.isAudioTrack()) {
localAudio = track;
}
else if (track.isVideoTrack()) {
localVideo = track;
}
addTrack(track);
APP.UI.addLocalStream(track);
});
roomLocker = createRoomLocker(room); roomLocker = createRoomLocker(room);
this._room = room; // FIXME do not use this this._room = room; // FIXME do not use this
this.localId = room.myUserId(); this.localId = room.myUserId();
@ -277,17 +287,6 @@ export default {
_setupListeners () { _setupListeners () {
// add local streams when joined to the conference // add local streams when joined to the conference
room.on(ConferenceEvents.CONFERENCE_JOINED, () => { room.on(ConferenceEvents.CONFERENCE_JOINED, () => {
localTracks.forEach((track) => {
if(track.isAudioTrack()) {
localAudio = track;
}
else if (track.isVideoTrack()) {
localVideo = track;
}
addTrack(track);
APP.UI.addLocalStream(track);
});
APP.UI.updateAuthInfo(room.isAuthEnabled(), room.getAuthLogin()); APP.UI.updateAuthInfo(room.isAuthEnabled(), room.getAuthLogin());
APP.UI.mucJoined(); APP.UI.mucJoined();
}); });
@ -514,18 +513,20 @@ export default {
APP.UI.addListener(UIEvents.START_MUTED_CHANGED, APP.UI.addListener(UIEvents.START_MUTED_CHANGED,
(startAudioMuted, startVideoMuted) => { (startAudioMuted, startVideoMuted) => {
room.setStartMuted(startAudioMuted, startVideoMuted); room.setStartMutedPolicy({audio: startAudioMuted,
video: startVideoMuted});
} }
); );
room.on( room.on(
ConferenceEvents.START_MUTED, ConferenceEvents.START_MUTED_POLICY_CHANGED,
function (startAudioMuted, startVideoMuted, initiallyMuted) { (policy) => {
APP.UI.onStartMutedChanged(); APP.UI.onStartMutedChanged();
if (initiallyMuted) {
APP.UI.notifyInitiallyMuted();
}
} }
); );
room.on(ConferenceEvents.STARTED_MUTED, () => {
(room.isStartAudioMuted() || room.isStartVideoMuted())
&& APP.UI.notifyInitiallyMuted();
});
APP.UI.addListener(UIEvents.USER_INVITED, (roomUrl) => { APP.UI.addListener(UIEvents.USER_INVITED, (roomUrl) => {
APP.UI.inviteParticipants( APP.UI.inviteParticipants(

1430
libs/lib-jitsi-meet.js
View File

File diff suppressed because it is too large Load Diff