diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
commit | 8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch) | |
tree | 9e8e66772d44c4f9010a48c8e0afed70421238b1 /webapp/non_npm_dependencies/janus | |
parent | 4208e42ba9df02b9c4bd7081179922c21206d83d (diff) | |
parent | aafb8be87c79c60df7534b3b69f967c6301b157e (diff) | |
download | chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2 chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip |
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/non_npm_dependencies/janus')
-rw-r--r-- | webapp/non_npm_dependencies/janus/index.js | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/webapp/non_npm_dependencies/janus/index.js b/webapp/non_npm_dependencies/janus/index.js index 688cfc202..b4b88761b 100644 --- a/webapp/non_npm_dependencies/janus/index.js +++ b/webapp/non_npm_dependencies/janus/index.js @@ -1,31 +1,4 @@ /* - The MIT License (MIT) - - Copyright (c) 2016 Meetecho - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - */ - -var adapter = require('webrtc-adapter'); - -// List of sessions -/* The MIT License (MIT) Copyright (c) 2016 Meetecho @@ -49,6 +22,8 @@ var adapter = require('webrtc-adapter'); OTHER DEALINGS IN THE SOFTWARE. */ +var adapter = require('webrtc-adapter'); + // List of sessions Janus.sessions = {}; @@ -849,6 +824,7 @@ function Janus(gatewayCallbacks) { callbacks.consentDialog = (typeof callbacks.consentDialog == "function") ? callbacks.consentDialog : Janus.noop; callbacks.mediaState = (typeof callbacks.mediaState == "function") ? callbacks.mediaState : Janus.noop; callbacks.webrtcState = (typeof callbacks.webrtcState == "function") ? callbacks.webrtcState : Janus.noop; + callbacks.slowLink = (typeof callbacks.slowLink == "function") ? callbacks.slowLink : Janus.noop; callbacks.onmessage = (typeof callbacks.onmessage == "function") ? callbacks.onmessage : Janus.noop; callbacks.onlocalstream = (typeof callbacks.onlocalstream == "function") ? callbacks.onlocalstream : Janus.noop; callbacks.onremotestream = (typeof callbacks.onremotestream == "function") ? callbacks.onremotestream : Janus.noop; @@ -929,6 +905,7 @@ function Janus(gatewayCallbacks) { consentDialog : callbacks.consentDialog, mediaState : callbacks.mediaState, webrtcState : callbacks.webrtcState, + slowLink : callbacks.slowLink, onmessage : callbacks.onmessage, createOffer : function(callbacks) { prepareWebrtc(handleId, callbacks); }, createAnswer : function(callbacks) { prepareWebrtc(handleId, callbacks); }, @@ -1010,6 +987,7 @@ function Janus(gatewayCallbacks) { consentDialog : callbacks.consentDialog, mediaState : callbacks.mediaState, webrtcState : callbacks.webrtcState, + slowLink : callbacks.slowLink, onmessage : callbacks.onmessage, createOffer : function(callbacks) { prepareWebrtc(handleId, callbacks); }, createAnswer : function(callbacks) { prepareWebrtc(handleId, callbacks); }, |