Skip to content
Snippets Groups Projects
Commit 6c9238b1 authored by Travis Kemen's avatar Travis Kemen
Browse files

A few fixes for event socket differences between FreeSWITCH 1.4 and 1.6

parent 50cf1776
No related branches found
No related tags found
No related merge requests found
...@@ -51,7 +51,7 @@ libraryDependencies ++= { ...@@ -51,7 +51,7 @@ libraryDependencies ++= {
"redis.clients" % "jedis" % "2.1.0", "redis.clients" % "jedis" % "2.1.0",
"org.apache.commons" % "commons-lang3" % "3.2", "org.apache.commons" % "commons-lang3" % "3.2",
"org.bigbluebutton" % "bbb-common-message" % "0.0.15", "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: _*) seq(Revolver.settings: _*)
......
...@@ -6,7 +6,7 @@ description := "BigBlueButton custom FS-ESL client built on top of FS-ESL Java l ...@@ -6,7 +6,7 @@ description := "BigBlueButton custom FS-ESL client built on top of FS-ESL Java l
organization := "org.bigbluebutton" organization := "org.bigbluebutton"
version := "0.0.2" version := "0.0.3"
// We want to have our jar files in lib_managed dir. // We want to have our jar files in lib_managed dir.
// This way we'll have the right path when we import // This way we'll have the right path when we import
...@@ -81,4 +81,4 @@ pomExtra := ( ...@@ -81,4 +81,4 @@ pomExtra := (
licenses := Seq("Apache License, Version 2.0" -> url("http://opensource.org/licenses/Apache-2.0")) licenses := Seq("Apache License, Version 2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
homepage := Some(url("http://www.bigbluebutton.org")) homepage := Some(url("http://www.bigbluebutton.org"))
\ No newline at end of file
...@@ -479,20 +479,43 @@ public class Client ...@@ -479,20 +479,43 @@ public class Client
//Member transfered to another conf... //Member transfered to another conf...
listener.conferenceEventTransfer(uniqueId, confName, confSize, event); listener.conferenceEventTransfer(uniqueId, confName, confSize, event);
return; 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")) { } else if (eventFunc.equals("conference_add_member")) {
System.out.println("##### Client conference_add_member"); System.out.println("##### Client conference_add_member");
listener.conferenceEventJoin(uniqueId, confName, confSize, event); listener.conferenceEventJoin(uniqueId, confName, confSize, event);
return; 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")) { } else if (eventFunc.equals("conference_del_member")) {
System.out.println("##### Client conference_del_member"); System.out.println("##### Client conference_del_member");
listener.conferenceEventLeave(uniqueId, confName, confSize, event); listener.conferenceEventLeave(uniqueId, confName, confSize, event);
return; 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")) { } else if (eventFunc.equals("conf_api_sub_mute")) {
listener.conferenceEventMute(uniqueId, confName, confSize, event); listener.conferenceEventMute(uniqueId, confName, confSize, event);
return; 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")) { } else if (eventFunc.equals("conf_api_sub_unmute")) {
listener.conferenceEventUnMute(uniqueId, confName, confSize, event); listener.conferenceEventUnMute(uniqueId, confName, confSize, event);
return; 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")) { } else if (eventFunc.equals("conference_record_thread_run")) {
System.out.println("##### Client conference_record_thread_run"); System.out.println("##### Client conference_record_thread_run");
listener.conferenceEventRecord(uniqueId, confName, confSize, event); listener.conferenceEventRecord(uniqueId, confName, confSize, event);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment