Commit 65605ee3 authored 8 years ago by Richard Alam Committed by GitHub 8 years ago

Merge pull request #3296 from ritzalam/start-pause-stop-screen-sharing-with-webrtc

Stop JWS when flash client dies.

parents 86062ddd a82fcd7f

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MeetingCreatedMessage.java 7 additions, 5 deletions

.../bigbluebutton/common/messages/MeetingCreatedMessage.java
bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar 0 additions, 0 deletions

bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/IScreenShareApplication.java 2 additions, 1 deletion

...igbluebutton/app/screenshare/IScreenShareApplication.java
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/events/ScreenShareClientPing.java 16 additions, 0 deletions

...ebutton/app/screenshare/events/ScreenShareClientPing.java
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/messaging/redis/RedisPubSubMessageHandler.java 1 addition, 1 deletion

...creenshare/messaging/redis/RedisPubSubMessageHandler.java
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/EventListenerImp.java 19 additions, 1 deletion

.../bigbluebutton/app/screenshare/red5/EventListenerImp.java
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppHandler.java 6 additions, 2 deletions

...rg/bigbluebutton/app/screenshare/red5/Red5AppHandler.java
bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java 11 additions, 0 deletions

...rg/bigbluebutton/app/screenshare/red5/Red5AppService.java
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala 89 additions, 57 deletions

...igbluebutton/app/screenshare/ScreenShareApplication.scala
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveScreenshare.scala 4 additions, 3 deletions

...n/app/screenshare/server/sessions/ActiveScreenshare.scala
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala 83 additions, 76 deletions

...ebutton/app/screenshare/server/sessions/Screenshare.scala
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ScreenshareManager.scala 12 additions, 2 deletions

.../app/screenshare/server/sessions/ScreenshareManager.scala
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Session.scala 77 additions, 11 deletions

...gbluebutton/app/screenshare/server/sessions/Session.scala
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/messages/IMessage.scala 3 additions, 1 deletion

...n/app/screenshare/server/sessions/messages/IMessage.scala
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/TimeUtil.scala 9 additions, 1 deletion

.../bigbluebutton/app/screenshare/server/util/TimeUtil.scala
bbb-screenshare/jws/webstart/src/main/java/org/bigbluebutton/screenshare/client/DeskshareMain.java 0 additions, 1 deletion

...a/org/bigbluebutton/screenshare/client/DeskshareMain.java
bbb-screenshare/jws/webstart/src/main/java/org/bigbluebutton/screenshare/client/javacv/FfmpegScreenshare.java 5 additions, 11 deletions

...uebutton/screenshare/client/javacv/FfmpegScreenshare.java
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/events/ScreenShareClientPingMessage.as 23 additions, 0 deletions

...odules/screenshare/events/ScreenShareClientPingMessage.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as 6 additions, 0 deletions

...button/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml 7 additions, 1 deletion

...ebutton/modules/screenshare/maps/ScreenshareEventMap.mxml

with 380 additions and 174 deletions

Please register or to comment