diff --git a/bigbluebutton-client/src/ScreenshareStandalone.mxml b/bigbluebutton-client/src/ScreenshareStandalone.mxml
index c612a4968423290cb47b99fe625b821ff8f60647..a98fb5e963cd5e0694dbf9ceb16c8766c7cb2ee8 100755
--- a/bigbluebutton-client/src/ScreenshareStandalone.mxml
+++ b/bigbluebutton-client/src/ScreenshareStandalone.mxml
@@ -189,7 +189,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
}
- private function onUpdateCursorEvent(event:CursorEvent):void {
+ private function onUpdateCursorEvent(event:CursorEvent):void {
if (cursor == null) return;
cursor.x = videoHolder.x + (event.x * (videoHolder.width / videoWidth));
@@ -216,7 +216,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
case "NetStream.Play.Start":
trace("DeskshareSA::NetStream.Publish.Start for broadcast stream " + stream);
trace("DeskshareSA::Dispatching start viewing event");
- service.sendStartedViewingNotification(stream);
+ //service.sendStartedViewingNotification(stream);
break;
case "NetStream.Play.UnpublishNotify":
trace("DeskshareSA::NetStream.Play.UnpublishNotify for broadcast stream " + stream);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
index 727d6e9837b5535f7832813f290728d57056a5b8..45a876e560679dfedcbff9acd503aefa004a2863 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
@@ -73,12 +73,7 @@ package org.bigbluebutton.modules.screenshare.managers {
LOGGER.debug("handle Connection Success Event");
service.checkIfPresenterIsSharingScreen();
}
-
- public function handleStreamStoppedEvent():void {
- LOGGER.debug("Sending deskshare stopped command");
- service.stopSharingDesktop(module.getRoom(), module.getRoom());
- }
-
+
public function handleStreamStartedEvent(event:StreamStartedEvent):void {
ScreenshareModel.getInstance().streamId = event.streamId;
ScreenshareModel.getInstance().width = event.width;
@@ -114,10 +109,6 @@ package org.bigbluebutton.modules.screenshare.managers {
dispatcher.dispatchEvent(new ViewStreamEvent(ViewStreamEvent.START));
}
- public function handleStartedViewingEvent(stream:String):void {
- LOGGER.debug("handleStartedViewingEvent [" + stream + "]");
- service.sendStartedViewingNotification(stream);
- }
private function initDeskshare():void {
sharing = false;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as
index 9b6d9c4d64792e7e17eedc189a88da52074e72c9..09e9d40c9d71b5d14d98ea180898dbff1c13f312 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as
@@ -46,10 +46,6 @@ package org.bigbluebutton.modules.screenshare.managers {
if (isViewing) viewWindow.stopViewing();
}
- public function handleStartedViewingEvent(stream:String):void {
- LOGGER.debug("ViewerWindowManager handleStartedViewingEvent");
- service.sendStartedViewingNotification(stream);
- }
private function openWindow(window:IBbbModuleWindow):void {
var event:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
index 617f6d9726a3c642b922b2b1495e89ca54c6845c..18c42c875a842072d5ec31def8cacddeb85890a2 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
@@ -84,10 +84,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<MethodInvoker generator="{ScreenshareManager}" method="handleStreamStartedEvent" arguments="{event}"/>
</EventHandlers>
- <EventHandlers type="{StreamEvent.STOP}" >
- <MethodInvoker generator="{ScreenshareManager}" method="handleStreamStoppedEvent"/>
- </EventHandlers>
-
<EventHandlers type="{IsSharingScreenEvent.IS_SCREENSHARING}">
<MethodInvoker generator="{ScreenshareManager}" method="handleIsSharingScreenEvent" arguments="{event}"/>
</EventHandlers>
@@ -101,9 +97,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<MethodInvoker generator="{ScreenshareManager}" method="handleConnectionSuccessEvent"/>
</EventHandlers>
- <EventHandlers type="{StartedViewingEvent.STARTED_VIEWING_EVENT}">
- <MethodInvoker generator="{ScreenshareManager}" method="handleStartedViewingEvent" arguments="{event.stream}"/>
- </EventHandlers>
<EventHandlers type="{ViewWindowEvent.CLOSE}">
<MethodInvoker generator="{ScreenshareManager}" method="handleViewWindowCloseEvent"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/ScreenshareService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/ScreenshareService.as
index e3a81e18abca1e745e5e042948c7aa9a35c67571..d031dfa8701207cf29adf53da4aacac7b20d1769 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/ScreenshareService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/ScreenshareService.as
@@ -88,17 +88,6 @@ package org.bigbluebutton.modules.screenshare.services {
sender.stopShareRequest(UsersUtil.getInternalMeetingID(), streamId);
}
- public function sendStartViewingNotification(captureWidth:Number, captureHeight:Number):void {
- conn.sendStartViewingNotification(captureWidth, captureHeight);
- }
-
- public function sendStartedViewingNotification(stream:String):void {
- conn.sendStartedViewingNotification(stream);
- }
-
- public function stopSharingDesktop(meetingId:String, stream:String):void {
- conn.stopSharingDesktop(meetingId, stream);
- }
-
+
}
}
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as
index f0afa227076e81905cda4bb89a6c836864e2fc90..4c5719434c08e553ae07de95d92dbab4523497cb 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as
@@ -379,14 +379,6 @@ package org.bigbluebutton.modules.screenshare.services.red5 {
}
}
- public function sendStartedViewingNotification(stream:String):void {
- LOGGER.debug("Sending start viewing to server");
- netConn.call("deskshare.startedToViewStream", null, stream);
- }
-
- public function stopSharingDesktop(meetingId:String, stream:String):void {
- netConn.call("deskshare.stopSharingDesktop", null, meetingId);
- }
/**
* Called by the server when a notification is received to start viewing the broadcast stream .
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
index 38b8dd6f2b2387276c97f4391d181171febdccfd..249d92a9deb4823f4e342230aa697227fb07b138 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
@@ -219,10 +219,6 @@
case "NetStream.Play.Start":
LOGGER.debug("NetStream.Publish.Start for broadcast stream " + streamId);
JSLog.debug(LOG + "NetStream.Publish.Start for broadcast stream ", logData);
- var dispatcher: Dispatcher = new Dispatcher();
- var viewEvent:StartedViewingEvent = new StartedViewingEvent(StartedViewingEvent.STARTED_VIEWING_EVENT);
- viewEvent.stream = streamId;
- dispatcher.dispatchEvent(viewEvent);
break;
case "NetStream.Play.UnpublishNotify":
LOGGER.debug("NetStream.Play.UnpublishNotify for broadcast stream " + streamId);