From 6c9238b10516138b6b9427d7a00a07a70b8a6737 Mon Sep 17 00:00:00 2001
From: Travis Kemen <kemen04@gmail.com>
Date: Tue, 29 Dec 2015 19:30:48 -0600
Subject: [PATCH] A few fixes for event socket differences between FreeSWITCH
1.4 and 1.6
---
akka-bbb-fsesl/build.sbt | 2 +-
bbb-fsesl-client/build.sbt | 4 ++--
.../freeswitch/esl/client/inbound/Client.java | 23 +++++++++++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/akka-bbb-fsesl/build.sbt b/akka-bbb-fsesl/build.sbt
index 05c3543826..d395f36ef9 100755
--- a/akka-bbb-fsesl/build.sbt
+++ b/akka-bbb-fsesl/build.sbt
@@ -51,7 +51,7 @@ libraryDependencies ++= {
"redis.clients" % "jedis" % "2.1.0",
"org.apache.commons" % "commons-lang3" % "3.2",
"org.bigbluebutton" % "bbb-common-message" % "0.0.15",
- "org.bigbluebutton" % "bbb-fsesl-client" % "0.0.2"
+ "org.bigbluebutton" % "bbb-fsesl-client" % "0.0.3"
)}
seq(Revolver.settings: _*)
diff --git a/bbb-fsesl-client/build.sbt b/bbb-fsesl-client/build.sbt
index eb9f166450..b247bcc1a8 100755
--- a/bbb-fsesl-client/build.sbt
+++ b/bbb-fsesl-client/build.sbt
@@ -6,7 +6,7 @@ description := "BigBlueButton custom FS-ESL client built on top of FS-ESL Java l
organization := "org.bigbluebutton"
-version := "0.0.2"
+version := "0.0.3"
// We want to have our jar files in lib_managed dir.
// This way we'll have the right path when we import
@@ -81,4 +81,4 @@ pomExtra := (
licenses := Seq("Apache License, Version 2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
homepage := Some(url("http://www.bigbluebutton.org"))
-
\ No newline at end of file
+
diff --git a/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java b/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
index 1ae3205d9c..e65b134199 100755
--- a/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
+++ b/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
@@ -479,20 +479,43 @@ public class Client
//Member transfered to another conf...
listener.conferenceEventTransfer(uniqueId, confName, confSize, event);
return;
+ //API has changed between freeswitch 1.4 and 1.6
+ } else if (eventFunc.equals("conference_api_sub_transfer")) {
+ //Member transfered to another conf...
+ listener.conferenceEventTransfer(uniqueId, confName, confSize, event);
+ return;
} else if (eventFunc.equals("conference_add_member")) {
System.out.println("##### Client conference_add_member");
listener.conferenceEventJoin(uniqueId, confName, confSize, event);
return;
+ //API has changed between freeswitch 1.4 and 1.6
+ } else if (eventFunc.equals("conference_member_add")) {
+ System.out.println("##### Client conference_member_add");
+ listener.conferenceEventJoin(uniqueId, confName, confSize, event);
+ return;
} else if (eventFunc.equals("conference_del_member")) {
System.out.println("##### Client conference_del_member");
listener.conferenceEventLeave(uniqueId, confName, confSize, event);
return;
+ //API has changed between freeswitch 1.4 and 1.6
+ } else if (eventFunc.equals("conference_member_del")) {
+ System.out.println("##### Client conference_member_del");
+ listener.conferenceEventLeave(uniqueId, confName, confSize, event);
+ return;
} else if (eventFunc.equals("conf_api_sub_mute")) {
listener.conferenceEventMute(uniqueId, confName, confSize, event);
return;
+ //API has changed between freeswitch 1.4 and 1.6
+ } else if (eventFunc.equals("conference_api_sub_mute")) {
+ listener.conferenceEventMute(uniqueId, confName, confSize, event);
+ return;
} else if (eventFunc.equals("conf_api_sub_unmute")) {
listener.conferenceEventUnMute(uniqueId, confName, confSize, event);
return;
+ //API has changed between freeswitch 1.4 and 1.6
+ } else if (eventFunc.equals("conference_api_sub_unmute")) {
+ listener.conferenceEventUnMute(uniqueId, confName, confSize, event);
+ return;
} else if (eventFunc.equals("conference_record_thread_run")) {
System.out.println("##### Client conference_record_thread_run");
listener.conferenceEventRecord(uniqueId, confName, confSize, event);
--
GitLab