From 5e9200bc3c8d6bc81c35702c3731f5c834a053de Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Fri, 7 Aug 2015 15:20:53 +0200 Subject: [PATCH] Trigger signalingState changes. --- static/js/mediastream/peercall.js | 6 ++++++ static/js/mediastream/peerconnection.js | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/static/js/mediastream/peercall.js b/static/js/mediastream/peercall.js index 97a09f3f..fe4a55d0 100644 --- a/static/js/mediastream/peercall.js +++ b/static/js/mediastream/peercall.js @@ -211,6 +211,12 @@ define(['jquery', 'underscore', 'mediastream/utils', 'mediastream/peerconnection } }; + PeerCall.prototype.onSignalingStateChange = function(signalingState) { + + this.e.triggerHandler("signalingStateChange", [signalingState, this]); + + }; + PeerCall.prototype.onIceConnectionStateChange = function(iceConnectionState) { this.e.triggerHandler("connectionStateChange", [iceConnectionState, this]); diff --git a/static/js/mediastream/peerconnection.js b/static/js/mediastream/peerconnection.js index d7ede17b..5c575c83 100644 --- a/static/js/mediastream/peerconnection.js +++ b/static/js/mediastream/peerconnection.js @@ -94,9 +94,7 @@ define(['jquery', 'underscore', 'webrtc.adapter'], function($, _) { pc.onnegotiationneeded = _.bind(this.onNegotiationNeeded, this); } pc.ondatachannel = _.bind(this.onDatachannel, this); - pc.onsignalingstatechange = function(event) { - console.debug("Signaling state changed", pc.signalingState); - }; + pc.onsignalingstatechange = _.bind(this.onSignalingStateChange, this); // NOTE(longsleep): // Support old callback too (https://groups.google.com/forum/?fromgroups=#!topic/discuss-webrtc/glukq0OWwVM) // Chrome < 27 and Firefox < 24 need this. @@ -222,10 +220,18 @@ define(['jquery', 'underscore', 'webrtc.adapter'], function($, _) { }; + PeerConnection.prototype.onSignalingStateChange = function(event) { + + var signalingState = event.target.signalingState; + console.debug("Connection signaling state change", signalingState, this.currentcall.id); + this.currentcall.onSignalingStateChange(signalingState); + + }; + PeerConnection.prototype.onIceConnectionStateChange = function(event) { var iceConnectionState = event.target.iceConnectionState; - console.info("ICE connection state change", iceConnectionState, event, this.currentcall); + console.debug("ICE connection state change", iceConnectionState, this.currentcall.id); this.currentcall.onIceConnectionStateChange(iceConnectionState); };