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

Merge pull request #699 from ritzalam/add-more-logging-to-video-disconnect

Browse Source 
- only remove stream if present
This commit is contained in:
Richard Alam 2015-07-14 14:15:40 -04:00
commit 82f2033d18
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,11 +249,14 @@ trait UsersApp {
def handleUserunshareWebcam(msg: UserUnshareWebcam) {
usersModel.getUser(msg.userId) foreach { user =>
val streams = user.webcamStreams - msg.stream
val uvo = user.copy(hasStream = (!streams.isEmpty), webcamStreams = streams)
usersModel.addUser(uvo)
log.info("User unshared webcam: mid=[" + mProps.meetingID + "] uid=[" + uvo.userID + "] unsharedStream=[" + msg.stream + "] streams=[" + streams + "]")
outGW.send(new UserUnsharedWebcam(mProps.meetingID, mProps.recorded, uvo.userID, msg.stream))
val streamName = user.webcamStreams find (w => w == msg.stream) foreach { streamName =>
val streams = user.webcamStreams - streamName
val uvo = user.copy(hasStream = (!streams.isEmpty), webcamStreams = streams)
usersModel.addUser(uvo)
log.info("User unshared webcam: mid=[" + mProps.meetingID + "] uid=[" + uvo.userID + "] unsharedStream=[" + msg.stream + "] streams=[" + streams + "]")
outGW.send(new UserUnsharedWebcam(mProps.meetingID, mProps.recorded, uvo.userID, msg.stream))
}
}
}