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

Merge ccb42dd996 into a1da42ff00

This commit is contained in:
Philipp Hancke 2014-12-20 13:53:04 +00:00
parent a1da42ff00 ccb42dd996
commit 0413da890d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/RTC/RTC.js
View File

@ -1,5 +1,8 @@
var EventEmitter = require("events");
var RTCUtils = require("./RTCUtils.js");
var LocalStream = require("./LocalStream.js");
var MediaStream = require("./MediaStream.js")
var DataChannels = require("./DataChannels");
//These lines should be uncommented when require works in app.js
//var StreamEventTypes = require("../../service/RTC/StreamEventTypes.js");
//var XMPPEvents = require("../service/xmpp/XMPPEvents");
@ -22,7 +25,6 @@ var RTC = {
eventEmitter.removeListener(eventType, listener);
},
createLocalStream: function (stream, type) {
var LocalStream = require("./LocalStream.js");
var localStream = new LocalStream(stream, type, eventEmitter);
this.localStreams.push(localStream);
if(type == "audio")
@ -47,7 +49,6 @@ var RTC = {
}
},
createRemoteStream: function (data, sid, thessrc) {
var MediaStream = require("./MediaStream.js")
var remoteStream = new MediaStream(data, sid, thessrc, eventEmitter);
var jid = data.peerjid || connection.emuc.myroomjid;
if(!this.remoteStreams[jid]) {
@ -94,7 +95,6 @@ var RTC = {
this.rtcUtils.obtainAudioAndVideoPermissions();
},
onConferenceCreated: function(event) {
var DataChannels = require("./DataChannels");
DataChannels.bindDataChannelListener(event.peerconnection);
},
muteRemoteVideoStream: function (jid, value) {