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

- sometimes we see multiple wav files on recorded meetings. This was due to starting recording again

Browse Source 
when the user gets disconnected from bbb-apps but still connected to audio.
This commit is contained in:
Richard Alam 2015-12-02 23:03:44 +00:00
parent adffa270ff
commit 0bba549b38
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
View File

@ -390,7 +390,7 @@ trait UsersApp {
* and is reconnecting. Make the user as joined only in the voice conference. If we get a
* user left voice conference message, then we will remove the user from the users list.
*/
handleUserJoinedVoiceConfMessage((new UserJoinedVoiceConfMessage(mProps.voiceBridge,
switchUserToPhoneUser((new UserJoinedVoiceConfMessage(mProps.voiceBridge,
vu.userId, u.userID, u.externUserID, vu.callerName,
vu.callerNum, vu.muted, vu.talking, u.listenOnly)));
}
@ -461,6 +461,34 @@ trait UsersApp {
}
}
def switchUserToPhoneUser(msg: UserJoinedVoiceConfMessage) = {
log.info("User has been disconnected but still in voice conf. Switching to phone user. meetingId="
+ mProps.meetingID + " callername=" + msg.callerIdName
+ " userId=" + msg.userId + " extUserId=" + msg.externUserId)
usersModel.getUser(msg.userId) match {
case Some(user) => {
val vu = new VoiceUser(msg.voiceUserId, msg.userId, msg.callerIdName,
msg.callerIdNum, joined = true, locked = false,
msg.muted, msg.talking, msg.listenOnly)
val nu = user.copy(voiceUser = vu, listenOnly = msg.listenOnly)
usersModel.addUser(nu)
log.info("User joined voice. meetingId=" + mProps.meetingID + " userId=" + user.userID + " user=" + nu)
outGW.send(new UserJoinedVoice(mProps.meetingID, mProps.recorded, mProps.voiceBridge, nu))
if (meetingModel.isMeetingMuted()) {
outGW.send(new MuteVoiceUser(mProps.meetingID, mProps.recorded,
nu.userID, nu.userID, mProps.voiceBridge,
nu.voiceUser.userId, meetingModel.isMeetingMuted()))
}
}
case None => {
handleUserJoinedVoiceFromPhone(msg)
}
}
}
def handleUserJoinedVoiceConfMessage(msg: UserJoinedVoiceConfMessage) = {
log.info("Received user joined voice. meetingId=" + mProps.meetingID + " callername=" + msg.callerIdName
+ " userId=" + msg.userId + " extUserId=" + msg.externUserId)