Commit 6409bd9f authored 7 years ago by Richard Alam Committed by GitHub 7 years ago

Merge pull request #4073 from ritzalam/change-deskshare-to-screenshare

try renaming deskshare to screenshare

parents 002e3e89 d48f46c5

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/java/org/bigbluebutton/core/pubsub/receivers/DeskShareMessageReceiver.java 0 additions, 59 deletions

...utton/core/pubsub/receivers/DeskShareMessageReceiver.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java 0 additions, 3 deletions

...luebutton/core/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala 0 additions, 31 deletions

...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/ScreenshareModel.scala 115 additions, 0 deletions

.../scala/org/bigbluebutton/core/apps/ScreenshareModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/deskshare/DeskshareStoppedVoiceConfEvtMsgHdlr.scala 0 additions, 38 deletions

.../apps/deskshare/DeskshareStoppedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareApp2x.scala 17 additions, 0 deletions

...igbluebutton/core/apps/screenshare/ScreenshareApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala 16 additions, 16 deletions

.../ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr.scala 13 additions, 13 deletions

.../ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStartedVoiceConfEvtMsgHdlr.scala 44 additions, 0 deletions

...s/screenshare/ScreenshareStartedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStoppedVoiceConfEvtMsgHdlr.scala 38 additions, 0 deletions

...s/screenshare/ScreenshareStoppedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/DeskShareMessageToJsonConverter.scala 0 additions, 39 deletions

...core/pubsub/senders/DeskShareMessageToJsonConverter.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 9 additions, 9 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala 1 addition, 1 deletion

...in/scala/org/bigbluebutton/core/running/LiveMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 11 additions, 11 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala 1 addition, 1 deletion

...scala/org/bigbluebutton/core/running/RunningMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala 2 additions, 2 deletions

.../org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java 0 additions, 30 deletions

...ton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/FreeswitchConferenceEventListener.java 9 additions, 9 deletions

...n/freeswitch/voice/FreeswitchConferenceEventListener.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/events/ScreenshareRTMPBroadcastEvent.java 5 additions, 5 deletions

...reeswitch/voice/events/ScreenshareRTMPBroadcastEvent.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/events/ScreenshareStartedEvent.java 2 additions, 2 deletions

...tton/freeswitch/voice/events/ScreenshareStartedEvent.java

with 283 additions and 269 deletions

Please register or to comment