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

- do not record events if the meeting is not recorded

Browse Source
This commit is contained in:
Richard Alam 2016-01-21 20:42:47 +00:00
parent 58292b198d
commit 6956ddf723
1 changed files with 65 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
View File

@ -297,21 +297,30 @@ class RecorderActor(val meetingId: String, val recorder: RecorderApplication)
} }
private def handleChangedUserEmojiStatus(msg: UserChangedEmojiStatus) { private def handleChangedUserEmojiStatus(msg: UserChangedEmojiStatus) {
val status = UserStatusChange(msg.meetingID, msg.recorded, if (msg.recorded) {
msg.userID, "emojiStatus", msg.emojiStatus) val status = UserStatusChange(msg.meetingID, msg.recorded,
handleUserStatusChange(status) msg.userID, "emojiStatus", msg.emojiStatus)
handleUserStatusChange(status)
}
} }
private def handleUserSharedWebcam(msg: UserSharedWebcam) { private def handleUserSharedWebcam(msg: UserSharedWebcam) {
val status = UserStatusChange(msg.meetingID, msg.recorded, if (msg.recorded) {
msg.userID, "hasStream", "true,stream=" + msg.stream) val status = UserStatusChange(msg.meetingID, msg.recorded,
handleUserStatusChange(status) msg.userID, "hasStream", "true,stream=" + msg.stream)
handleUserStatusChange(status)
}
} }
private def handleUserUnsharedWebcam(msg: UserUnsharedWebcam) { private def handleUserUnsharedWebcam(msg: UserUnsharedWebcam) {
val status = UserStatusChange(msg.meetingID, msg.recorded, if (msg.recorded) {
msg.userID, "hasStream", "false,stream=" + msg.stream) val status = UserStatusChange(msg.meetingID, msg.recorded,
handleUserStatusChange(status) msg.userID, "hasStream", "false,stream=" + msg.stream)
handleUserStatusChange(status)
}
} }
private def handleUserStatusChange(msg: UserStatusChange): Unit = { private def handleUserStatusChange(msg: UserStatusChange): Unit = {
@ -365,55 +374,64 @@ class RecorderActor(val meetingId: String, val recorder: RecorderApplication)
} }
private def handleSendWhiteboardAnnotationEvent(msg: SendWhiteboardAnnotationEvent) { private def handleSendWhiteboardAnnotationEvent(msg: SendWhiteboardAnnotationEvent) {
if ((msg.shape.shapeType == WhiteboardKeyUtil.TEXT_TYPE) && (msg.shape.status != WhiteboardKeyUtil.TEXT_CREATED_STATUS)) { if (msg.recorded) {
if ((msg.shape.shapeType == WhiteboardKeyUtil.TEXT_TYPE) && (msg.shape.status != WhiteboardKeyUtil.TEXT_CREATED_STATUS)) {
val event = new ModifyTextWhiteboardRecordEvent() val event = new ModifyTextWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId)
event.addAnnotation(mapAsJavaMap(msg.shape.shape))
recorder.record(msg.meetingID, event)
} else if ((msg.shape.shapeType == WhiteboardKeyUtil.POLL_RESULT_TYPE)) {
val event = new AddShapeWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId);
event.addAnnotation(mapAsJavaMap(msg.shape.shape))
recorder.record(msg.meetingID, event)
} else {
val event = new AddShapeWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId);
event.addAnnotation(mapAsJavaMap(msg.shape.shape))
recorder.record(msg.meetingID, event)
}
}
}
private def handleClearWhiteboardEvent(msg: ClearWhiteboardEvent) {
if (msg.recorded) {
val event = new ClearPageWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID) event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp) event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId)) event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId)) event.setPageNumber(getPageNum(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId) event.setWhiteboardId(msg.whiteboardId)
event.addAnnotation(mapAsJavaMap(msg.shape.shape))
recorder.record(msg.meetingID, event)
} else if ((msg.shape.shapeType == WhiteboardKeyUtil.POLL_RESULT_TYPE)) {
val event = new AddShapeWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId);
event.addAnnotation(mapAsJavaMap(msg.shape.shape))
recorder.record(msg.meetingID, event)
} else {
val event = new AddShapeWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId);
event.addAnnotation(mapAsJavaMap(msg.shape.shape))
recorder.record(msg.meetingID, event) recorder.record(msg.meetingID, event)
} }
}
private def handleClearWhiteboardEvent(msg: ClearWhiteboardEvent) {
val event = new ClearPageWhiteboardRecordEvent()
event.setMeetingId(msg.meetingID)
event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPresentation(getPresentationId(msg.whiteboardId))
event.setPageNumber(getPageNum(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId)
recorder.record(msg.meetingID, event)
} }
private def handleUndoWhiteboardEvent(msg: UndoWhiteboardEvent) { private def handleUndoWhiteboardEvent(msg: UndoWhiteboardEvent) {
val event = new UndoShapeWhiteboardRecordEvent() if (msg.recorded) {
event.setMeetingId(msg.meetingID) val event = new UndoShapeWhiteboardRecordEvent()
event.setTimestamp(TimestampGenerator.generateTimestamp) event.setMeetingId(msg.meetingID)
event.setPresentation(getPresentationId(msg.whiteboardId)) event.setTimestamp(TimestampGenerator.generateTimestamp)
event.setPageNumber(getPageNum(msg.whiteboardId)) event.setPresentation(getPresentationId(msg.whiteboardId))
event.setWhiteboardId(msg.whiteboardId) event.setPageNumber(getPageNum(msg.whiteboardId))
event.setShapeId(msg.shapeId); event.setWhiteboardId(msg.whiteboardId)
recorder.record(msg.meetingID, event) event.setShapeId(msg.shapeId);
recorder.record(msg.meetingID, event)
}
} }
} }