From 47ab72de88ae5b6810e549fcdd51ea3edb73e93e Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Wed, 16 Aug 2017 10:17:23 -0400
Subject: [PATCH] handle renamed stop_talking_handler event from FreeSWITCH
---
akka-bbb-fsesl/build.sbt | 2 +-
bbb-fsesl-client/build.sbt | 2 +-
.../org/freeswitch/esl/client/inbound/Client.java | 3 +++
.../modules/users/services/MessageReceiver.as | 14 +-------------
4 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/akka-bbb-fsesl/build.sbt b/akka-bbb-fsesl/build.sbt
index 739e68acf7..ce59af4358 100755
--- a/akka-bbb-fsesl/build.sbt
+++ b/akka-bbb-fsesl/build.sbt
@@ -53,7 +53,7 @@ libraryDependencies ++= {
libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
-libraryDependencies += "org.bigbluebutton" % "bbb-fsesl-client" % "0.0.4"
+libraryDependencies += "org.bigbluebutton" % "bbb-fsesl-client" % "0.0.5"
// https://mvnrepository.com/artifact/org.scala-lang/scala-library
libraryDependencies += "org.scala-lang" % "scala-library" % "2.12.2"
diff --git a/bbb-fsesl-client/build.sbt b/bbb-fsesl-client/build.sbt
index e96d140fbe..8e67c00bd5 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.4"
+version := "0.0.5"
// We want to have our jar files in lib_managed dir.
// This way we'll have the right path when we import
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 4e17faad7b..577aa36f64 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
@@ -500,6 +500,9 @@ public class Client
} else if (eventFunc.equals("conference_loop_input")) {
listener.conferenceEventAction(uniqueId, confName, confSize, eventHeaders.get("Action"), event);
return;
+ } else if (eventFunc.equals("stop_talking_handler")) {
+ listener.conferenceEventAction(uniqueId, confName, confSize, eventHeaders.get("Action"), event);
+ return;
} else {
/* StringBuilder sb = new StringBuilder("");
sb.append("\n");
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
index a8fb5ff1cd..f01da1b5e9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
@@ -575,19 +575,7 @@ package org.bigbluebutton.modules.users.services
LiveMeeting.inst().voiceUsers.setListenOnlyForUser(userId, listenOnly);
}
-
-
- private function userTalk(userId:String, talking:Boolean):void {
- LiveMeeting.inst().voiceUsers.setMutedForUser(userId, talking);
-
- var event:CoreEvent = new CoreEvent(EventConstants.USER_TALKING);
- event.message.userID = userId;
- event.message.talking = talking;
- globalDispatcher.dispatchEvent(event);
-
- }
-
-
+
/**
* This meeting is in the process of ending by the server
*/
--
GitLab