[Pkg-voip-commits] [janus] 55/163: Merge branch 'master' into js-track

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.

commit 57eb0e356fdc74e441c6bd0f84666d87cae8e812
Merge: 5b8434f 6a57112
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Aug 1 16:02:51 2017 +0200

    Merge branch 'master' into js-track

 html/citeus.html           | 29 +++++++++++++++++
 html/videoroomtest.js      | 10 ++++--
 ice.c                      | 26 +++++----------
 janus.c                    | 57 +++++++++++++++++----------------
 janus.h                    |  4 +--
 plugins/janus_echotest.c   |  4 +--
 plugins/janus_recordplay.c |  2 +-
 plugins/janus_sip.c        | 11 +++++--
 plugins/janus_streaming.c  | 66 +++++++++++++++++++++++++++++---------
 plugins/janus_videocall.c  |  8 ++---
 plugins/janus_videoroom.c  | 80 +++++++++++++++++++++++++++++++++++-----------
 sdp-utils.c                | 18 +++++++++++
 sdp-utils.h                |  8 +++++
 utils.c                    |  6 ++--
 14 files changed, 234 insertions(+), 95 deletions(-)

diff --cc html/videoroomtest.js
index b801661,8b5ad08..c17a13d
--- a/html/videoroomtest.js
+++ b/html/videoroomtest.js
@@@ -431,10 -435,12 +435,12 @@@ function newRemoteFeed(id, display) 
  			},
  			onmessage: function(msg, jsep) {
  				Janus.debug(" ::: Got a message (listener) :::");
 -				Janus.debug(JSON.stringify(msg));
 +				Janus.debug(msg);
  				var event = msg["videoroom"];
  				Janus.debug("Event: " + event);
- 				if(event != undefined && event != null) {
+ 				if(msg["error"] !== undefined && msg["error"] !== null) {
+ 					bootbox.alert(msg["error"]);
+ 				} else if(event != undefined && event != null) {
  					if(event === "attached") {
  						// Subscriber created and attached
  						for(var i=1;i<6;i++) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git