Commit 0b649661 authored 4 years ago by Anton Georgiev

Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas

parents 6c5a0de1 851c2645

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala 13 additions, 0 deletions

...uebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala 27 additions, 0 deletions

...ore/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala 27 additions, 0 deletions

...core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala 23 additions, 0 deletions

...re/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 8 additions, 0 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 7 additions, 0 deletions

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

.../org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala 27 additions, 0 deletions

...la/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala
bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js 8 additions, 0 deletions

...html5/imports/api/external-videos/server/eventHandlers.js
bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js 19 additions, 0 deletions

...api/external-videos/server/handlers/startExternalVideo.js
bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js 18 additions, 0 deletions

.../api/external-videos/server/handlers/stopExternalVideo.js
bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js 19 additions, 0 deletions

...pi/external-videos/server/handlers/updateExternalVideo.js
bigbluebutton-html5/imports/api/external-videos/server/index.js 1 addition, 1 deletion

...ebutton-html5/imports/api/external-videos/server/index.js
bigbluebutton-html5/imports/api/external-videos/server/methods.js 0 additions, 2 deletions

...utton-html5/imports/api/external-videos/server/methods.js
bigbluebutton-html5/imports/api/external-videos/server/methods/destroyExternalVideo.js 0 additions, 11 deletions

...pi/external-videos/server/methods/destroyExternalVideo.js
bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js 29 additions, 13 deletions

.../external-videos/server/methods/emitExternalVideoEvent.js
bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js 8 additions, 15 deletions

...ernal-videos/server/methods/startWatchingExternalVideo.js
bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js 10 additions, 22 deletions

...ternal-videos/server/methods/stopWatchingExternalVideo.js
bigbluebutton-html5/imports/api/external-videos/server/streamer.js 45 additions, 0 deletions

...tton-html5/imports/api/external-videos/server/streamer.js
bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js 2 additions, 2 deletions

...mports/api/meetings/server/handlers/meetingDestruction.js

with 295 additions and 67 deletions

Please register or to comment