BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #359 from SenecaCDOT-BigBlueButton/fix-global-audio-leave

Browse Source 
applied a fix to global audio so that leaving notifies clients correctly
This commit is contained in:
Chad Pilkey 2014-08-15 13:27:00 -04:00
commit 9762e02b22
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
View File

@ -59,7 +59,7 @@ public class MeetingMessageHandler implements MessageHandler {
} else if (msg instanceof UserDisconnectedFromGlobalAudio) {
UserDisconnectedFromGlobalAudio emm = (UserDisconnectedFromGlobalAudio) msg;
log.debug("Received UserDisconnectedFromGlobalAudio toekn request. Meeting id [{}]", emm.name);
bbbGW.userConnectedToGlobalAudio(emm.voiceConf, emm.userid, emm.name);
bbbGW.userDisconnectedFromGlobalAudio(emm.voiceConf, emm.userid, emm.name);
}
}
} else if (channel.equalsIgnoreCase(MessagingConstants.TO_SYSTEM_CHANNEL)) {

2
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala Normal file → Executable file
View File

@ -42,7 +42,7 @@ trait UsersApp {
}
def handleUserDisconnectedFromGlobalAudio(msg: UserDisconnectedFromGlobalAudio) {
// println("*************** Got UserDisconnectedToGlobalAudio message for [" + msg.name + "] ********************" )
println("*************** Got UserDisconnectedToGlobalAudio message for [" + msg.name + "] ********************" )
val user = users.getUser(msg.userid)
user foreach {u =>
val uvo = u.copy(listenOnly=false)