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

fix issues after rebase

This commit is contained in:
isymchych 2015-12-07 12:22:11 +02:00
parent b7ac3e9a06
commit 9a00401b92
3 changed files with 409 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
JitsiConference.js
View File

@ -253,6 +253,16 @@ JitsiConference.prototype.onMemberLeft = function (jid) {
this.eventEmitter.emit(JitsiConferenceEvents.USER_LEFT, id);
};
JitsiConference.prototype.onDisplayNameChanged = function (jid, displayName) {
var id = Strophe.getResourceFromJid(jid);
var participant = this.getParticipantById(id);
if (!participant) {
return;
}
participant._displayName = displayName;
this.eventEmitter.emit(JitsiConferenceEvents.DISPLAY_NAME_CHANGED, id, displayName);
};
JitsiConference.prototype.onTrackAdded = function (track) {
var id = track.getParticipantId();
@ -338,21 +348,7 @@ function setupListeners(conference) {
});
conference.room.addListener(XMPPEvents.REMOTE_STREAM_RECEIVED,
conference.rtc.createRemoteStream.bind(conference.rtc));
//FIXME: Maybe remove event should not be associated with the conference.
conference.rtc.addListener(
StreamEventTypes.EVENT_TYPE_REMOTE_CREATED, conference.onTrackAdded.bind(conference)
);
//FIXME: Maybe remove event should not be associated with the conference.
conference.rtc.addListener(
StreamEventTypes.EVENT_TYPE_REMOTE_ENDED, conference.onTrackRemoved.bind(conference)
);
conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_LOCAL_ENDED, function (stream) {
conference.removeTrack(stream);
conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, stream);
});
conference.rtc.addListener(StreamEventTypes.TRACK_MUTE_CHANGED, function (track) {
conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
});
conference.room.addListener(XMPPEvents.MUC_JOINED, function () {
conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_JOINED);
});
@ -360,6 +356,41 @@ function setupListeners(conference) {
// conference.room.addListener(XMPPEvents.MUC_JOINED, function () {
// conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_LEFT);
// });
conference.room.addListener(XMPPEvents.MUC_MEMBER_JOINED, conference.onMemberJoined.bind(conference));
conference.room.addListener(XMPPEvents.MUC_MEMBER_LEFT, conference.onMemberLeft.bind(conference));
conference.room.addListener(XMPPEvents.DISPLAY_NAME_CHANGED, conference.onDisplayNameChanged.bind(conference));
conference.room.addListener(XMPPEvents.CONNECTION_INTERRUPTED, function () {
conference.eventEmitter.emit(JitsiConferenceEvents.CONNECTION_INTERRUPTED);
});
conference.room.addListener(XMPPEvents.CONNECTION_RESTORED, function () {
conference.eventEmitter.emit(JitsiConferenceEvents.CONNECTION_RESTORED);
});
conference.room.addListener(XMPPEvents.CONFERENCE_SETUP_FAILED, function () {
conference.eventEmitter.emit(JitsiConferenceEvents.SETUP_FAILED);
});
conference.rtc.addListener(
StreamEventTypes.EVENT_TYPE_REMOTE_CREATED, conference.onTrackAdded.bind(conference)
);
//FIXME: Maybe remove event should not be associated with the conference.
conference.rtc.addListener(
StreamEventTypes.EVENT_TYPE_REMOTE_ENDED, conference.onTrackRemoved.bind(conference)
);
//FIXME: Maybe remove event should not be associated with the conference.
conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_LOCAL_ENDED, function (stream) {
conference.removeTrack(stream);
conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, stream);
});
conference.rtc.addListener(StreamEventTypes.TRACK_MUTE_CHANGED, function (track) {
conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
});
conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
if(conference.lastActiveSpeaker !== id && conference.room) {
conference.lastActiveSpeaker = id;
@ -377,25 +408,6 @@ function setupListeners(conference) {
lastNEndpoints, endpointsEnteringLastN);
});
conference.room.addListener(XMPPEvents.MUC_MEMBER_JOINED, conference.onMemberJoined.bind(conference));
conference.room.addListener(XMPPEvents.MUC_MEMBER_LEFT, conference.onMemberLeft.bind(conference));
conference.room.addListener(XMPPEvents.DISPLAY_NAME_CHANGED, function (from, displayName) {
conference.eventEmitter.emit(JitsiConferenceEvents.DISPLAY_NAME_CHANGED,
Strophe.getResourceFromJid(from), displayName);
});
conference.room.addListener(XMPPEvents.CONNECTION_INTERRUPTED, function () {
conference.eventEmitter.emit(JitsiConferenceEvents.CONNECTION_INTERRUPTED);
});
conference.room.addListener(XMPPEvents.CONNECTION_RESTORED, function () {
conference.eventEmitter.emit(JitsiConferenceEvents.CONNECTION_RESTORED);
});
conference.room.addListener(XMPPEvents.CONFERENCE_SETUP_FAILED, function () {
conference.eventEmitter.emit(JitsiConferenceEvents.SETUP_FAILED);
});
if(conference.statistics) {
//FIXME: Maybe remove event should not be associated with the conference.
conference.statistics.addAudioLevelListener(function (ssrc, level) {

3
JitsiTrackErrors.js
View File

@ -1,6 +1,7 @@
module.exports = {
/**
* Returns JitsiTrackErrors based on the error object passed by GUM * @param error the error
* Returns JitsiTrackErrors based on the error object passed by GUM
* @param error the error
* @param {Object} options the options object given to GUM.
*/
parseError: function (error, options) {

688
lib-jitsi-meet.js
View File

File diff suppressed because it is too large Load Diff