浏览代码

Moves require to top for the RTC module.

j8
hristoterezov 10 年前
父节点
当前提交
ec5e0f09ea
共有 3 个文件被更改,包括 30 次插入29 次删除
  1. 16
    16
      libs/modules/RTC.bundle.js
  2. 8
    9
      modules/RTC/MediaStream.js
  3. 6
    4
      modules/RTC/RTC.js

+ 16
- 16
libs/modules/RTC.bundle.js
文件差异内容过多而无法显示
查看文件


+ 8
- 9
modules/RTC/MediaStream.js 查看文件

1
-var RTC = require("./RTC.js");
2
 ////These lines should be uncommented when require works in app.js
1
 ////These lines should be uncommented when require works in app.js
3
 //var RTCBrowserType = require("../../service/RTC/RTCBrowserType.js");
2
 //var RTCBrowserType = require("../../service/RTC/RTCBrowserType.js");
4
 //var StreamEventTypes = require("../../service/RTC/StreamEventTypes.js");
3
 //var StreamEventTypes = require("../../service/RTC/StreamEventTypes.js");
15
  *
14
  *
16
  * @constructor
15
  * @constructor
17
  */
16
  */
18
-function MediaStream(data, sid, ssrc, eventEmmiter) {
17
+function MediaStream(data, sid, ssrc, eventEmmiter, browser) {
19
     this.sid = sid;
18
     this.sid = sid;
20
     this.stream = data.stream;
19
     this.stream = data.stream;
21
     this.peerjid = data.peerjid;
20
     this.peerjid = data.peerjid;
24
         MediaStreamType.VIDEO_TYPE : MediaStreamType.AUDIO_TYPE;
23
         MediaStreamType.VIDEO_TYPE : MediaStreamType.AUDIO_TYPE;
25
     this.muted = false;
24
     this.muted = false;
26
     eventEmmiter.emit(StreamEventTypes.EVENT_TYPE_REMOTE_CREATED, this);
25
     eventEmmiter.emit(StreamEventTypes.EVENT_TYPE_REMOTE_CREATED, this);
26
+    if(browser == RTCBrowserType.RTC_BROWSER_FIREFOX)
27
+    {
28
+        if (!this.getVideoTracks)
29
+            this.getVideoTracks = function () { return []; };
30
+        if (!this.getAudioTracks)
31
+            this.getAudioTracks = function () { return []; };
32
+    }
27
 }
33
 }
28
 
34
 
29
-if(RTC.getBrowserType() == RTCBrowserType.RTC_BROWSER_FIREFOX)
30
-{
31
-    if (!MediaStream.prototype.getVideoTracks)
32
-        MediaStream.prototype.getVideoTracks = function () { return []; };
33
-    if (!MediaStream.prototype.getAudioTracks)
34
-        MediaStream.prototype.getAudioTracks = function () { return []; };
35
-}
36
 
35
 
37
 MediaStream.prototype.getOriginalStream = function()
36
 MediaStream.prototype.getOriginalStream = function()
38
 {
37
 {

+ 6
- 4
modules/RTC/RTC.js 查看文件

1
 var EventEmitter = require("events");
1
 var EventEmitter = require("events");
2
 var RTCUtils = require("./RTCUtils.js");
2
 var RTCUtils = require("./RTCUtils.js");
3
+var LocalStream = require("./LocalStream.js");
4
+var DataChannels = require("./DataChannels");
5
+var MediaStream = require("./MediaStream.js");
3
 //These lines should be uncommented when require works in app.js
6
 //These lines should be uncommented when require works in app.js
4
 //var StreamEventTypes = require("../../service/RTC/StreamEventTypes.js");
7
 //var StreamEventTypes = require("../../service/RTC/StreamEventTypes.js");
5
 //var XMPPEvents = require("../service/xmpp/XMPPEvents");
8
 //var XMPPEvents = require("../service/xmpp/XMPPEvents");
22
         eventEmitter.removeListener(eventType, listener);
25
         eventEmitter.removeListener(eventType, listener);
23
     },
26
     },
24
     createLocalStream: function (stream, type) {
27
     createLocalStream: function (stream, type) {
25
-        var LocalStream = require("./LocalStream.js");
28
+
26
         var localStream =  new LocalStream(stream, type, eventEmitter);
29
         var localStream =  new LocalStream(stream, type, eventEmitter);
27
         this.localStreams.push(localStream);
30
         this.localStreams.push(localStream);
28
         if(type == "audio")
31
         if(type == "audio")
47
         }
50
         }
48
     },
51
     },
49
     createRemoteStream: function (data, sid, thessrc) {
52
     createRemoteStream: function (data, sid, thessrc) {
50
-        var MediaStream = require("./MediaStream.js")
51
-        var remoteStream = new MediaStream(data, sid, thessrc, eventEmitter);
53
+        var remoteStream = new MediaStream(data, sid, thessrc, eventEmitter,
54
+            this.getBrowserType());
52
         var jid = data.peerjid || connection.emuc.myroomjid;
55
         var jid = data.peerjid || connection.emuc.myroomjid;
53
         if(!this.remoteStreams[jid]) {
56
         if(!this.remoteStreams[jid]) {
54
             this.remoteStreams[jid] = {};
57
             this.remoteStreams[jid] = {};
94
         this.rtcUtils.obtainAudioAndVideoPermissions();
97
         this.rtcUtils.obtainAudioAndVideoPermissions();
95
     },
98
     },
96
     onConferenceCreated: function(event) {
99
     onConferenceCreated: function(event) {
97
-        var DataChannels = require("./DataChannels");
98
         DataChannels.bindDataChannelListener(event.peerconnection);
100
         DataChannels.bindDataChannelListener(event.peerconnection);
99
     },
101
     },
100
     muteRemoteVideoStream: function (jid, value) {
102
     muteRemoteVideoStream: function (jid, value) {

正在加载...
取消
保存