Commit 35dc1c93 authored 7 years ago by Richard Alam

Merge branch 'ritzalam-fs-webrtc-screenshare' into bbb-2x-mconf

parents f37b02b7 f1bfac77

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/resources/application.conf 1 addition, 1 deletion

akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/deskshare/DeskshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala 17 additions, 15 deletions

...re/DeskshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/deskshare/DeskshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr.scala 18 additions, 16 deletions

...re/DeskshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/deskshare/DeskshareStartedVoiceConfEvtMsgHdlr.scala 12 additions, 12 deletions

.../apps/deskshare/DeskshareStartedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/deskshare/DeskshareStoppedVoiceConfEvtMsgHdlr.scala 11 additions, 12 deletions

.../apps/deskshare/DeskshareStoppedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserMutedInVoiceConfEvtMsgHdlr.scala 4 additions, 4 deletions

...tton/core/apps/voice/UserMutedInVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserTalkingInVoiceConfEvtMsgHdlr.scala 4 additions, 4 deletions

...on/core/apps/voice/UserTalkingInVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 5 additions, 0 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala 22 additions, 1 deletion

.../org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/EjectUserFromVoiceCmdMsgHdlr.scala 1 addition, 1 deletion

...core2/message/handlers/EjectUserFromVoiceCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/RecordingStartedVoiceConfEvtMsgHdlr.scala 6 additions, 4 deletions

...essage/handlers/RecordingStartedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala 1 addition, 1 deletion

...gbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java 2 additions, 2 deletions

...ebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala 1 addition, 2 deletions

...gbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala 55 additions, 1 deletion

.../org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala 6 additions, 0 deletions

...ala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala 59 additions, 12 deletions

.../scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala 7 additions, 3 deletions

...rc/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
bigbluebutton-client/.actionScriptProperties 1 addition, 11 deletions

bigbluebutton-client/.actionScriptProperties
bigbluebutton-client/.project 1 addition, 1 deletion

bigbluebutton-client/.project

with 234 additions and 103 deletions

Please register or to comment