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

Set webcamsOnlyForModerator in MeetingActor when the meeting is creator.

Browse Source
This commit is contained in:
Ghazi Triki 2018-01-09 20:47:03 +01:00
parent 8f47e7b7de
commit 9cad3facc3
3 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
View File

@ -32,7 +32,6 @@ import org.bigbluebutton.core.apps.breakout._
import org.bigbluebutton.core.apps.polls._
import org.bigbluebutton.core.apps.voice._
import scala.concurrent.duration._
import org.bigbluebutton.core2.testdata.FakeTestData
import org.bigbluebutton.core.apps.layout.LayoutApp2x
import org.bigbluebutton.core.apps.meeting.SyncGetMeetingInfoRespMsgHdlr
import org.bigbluebutton.core.apps.users.ChangeLockSettingsInMeetingCmdMsgHdlr
@ -138,6 +137,9 @@ class MeetingActor(
MeetingStatus2x.unmuteMeeting(liveMeeting.status)
}
// Set webcamsOnlyForModerator property in case we didn't after meeting creation
MeetingStatus2x.setWebcamsOnlyForModerator(liveMeeting.status, liveMeeting.props.usersProp.webcamsOnlyForModerator)
/*******************************************************************/
//object FakeTestData extends FakeTestData
//FakeTestData.createFakeUsers(liveMeeting)

1
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
View File

@ -248,6 +248,7 @@ public class MeetingService implements MessageListener {
logData.put("name", m.getName());
logData.put("duration", m.getDuration());
logData.put("isBreakout", m.isBreakout());
logData.put("webcamsOnlyForModerator", m.getWebcamsOnlyForModerator());
logData.put("record", m.isRecord());
logData.put("event", "create_meeting");
logData.put("description", "Create meeting.");

12
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
View File

@ -13,7 +13,8 @@ import org.bigbluebutton.presentation.messages._
import scala.concurrent.duration._
class BbbWebApiGWApp(val oldMessageReceivedGW: OldMessageReceivedGW,
class BbbWebApiGWApp(
val oldMessageReceivedGW: OldMessageReceivedGW,
val screenshareRtmpServer: String,
val screenshareRtmpBroadcastApp: String,
val screenshareConfSuffix: String) extends IBbbWebApiGWApp with SystemConfiguration {
@ -46,8 +47,7 @@ class BbbWebApiGWApp(val oldMessageReceivedGW: OldMessageReceivedGW,
//msgFromAkkaAppsEventBus.subscribe(meetingManagerActorRef, fromAkkaAppsChannel)
private val oldMeetingMsgHdlrActor = system.actorOf(
OldMeetingMsgHdlrActor.props(oldMessageReceivedGW), "oldMeetingMsgHdlrActor"
)
OldMeetingMsgHdlrActor.props(oldMessageReceivedGW), "oldMeetingMsgHdlrActor")
msgFromAkkaAppsEventBus.subscribe(oldMeetingMsgHdlrActor, fromAkkaAppsChannel)
private val msgToAkkaAppsToJsonActor = system.actorOf(
@ -92,7 +92,8 @@ class BbbWebApiGWApp(val oldMessageReceivedGW: OldMessageReceivedGW,
val meetingProp = MeetingProp(name = meetingName, extId = extMeetingId, intId = meetingId,
isBreakout = isBreakout.booleanValue())
val durationProps = DurationProps(duration = duration.intValue(),
val durationProps = DurationProps(
duration = duration.intValue(),
createdTime = createTime.longValue(), createDate,
maxInactivityTimeoutMinutes = maxInactivityTimeoutMinutes.intValue(),
warnMinutesBeforeMax = warnMinutesBeforeMax.intValue(),
@ -109,7 +110,8 @@ class BbbWebApiGWApp(val oldMessageReceivedGW: OldMessageReceivedGW,
val usersProp = UsersProp(maxUsers = maxUsers.intValue(), webcamsOnlyForModerator = webcamsOnlyForModerator.booleanValue(),
guestPolicy = guestPolicy)
val metadataProp = MetadataProp(mapAsScalaMap(metadata).toMap)
val screenshareProps = ScreenshareProps(screenshareConf = voiceBridge + screenshareConfSuffix,
val screenshareProps = ScreenshareProps(
screenshareConf = voiceBridge + screenshareConfSuffix,
red5ScreenshareIp = screenshareRtmpServer,
red5ScreenshareApp = screenshareRtmpBroadcastApp)