Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deskshare module #28

Merged
Merged
Diff settings

Always

Just for now

making code modifications according to code review comments

  • Loading branch information...
syeshchenko committed Jun 10, 2014
commit b9982a09c5705ad7b9f1752fcceb36aa1ceb3a63
Copy path View file
@@ -156,7 +156,6 @@
stage.addEventListener(Event.DEACTIVATE, fl_Deactivate);
stage.addEventListener(StageOrientationEvent.ORIENTATION_CHANGING, stageOrientationChangingHandler);
stage.scaleMode = flash.display.StageScaleMode.NO_SCALE;
// setup a custom orientation calculator based on the accelerometer because the default one doesn't work
_orientationCalc = new OrientationCalculator(pagesNavigatorView, accelerometerCallback);
@@ -2,8 +2,6 @@ package org.bigbluebutton
{
import org.bigbluebutton.command.CameraQualityCommand;
import org.bigbluebutton.command.CameraQualitySignal;
import org.bigbluebutton.command.CheckDeskshareStreamCommand;
import org.bigbluebutton.command.CheckDeskshareStreamSignal;
import org.bigbluebutton.command.ConnectCommand;
import org.bigbluebutton.command.ConnectSignal;
import org.bigbluebutton.command.DisconnectUserCommand;
@@ -106,7 +104,6 @@ package org.bigbluebutton
signalCommandMap.map(LoadSlideSignal).toCommand(LoadSlideCommand);
signalCommandMap.map(CameraQualitySignal).toCommand(CameraQualityCommand);
signalCommandMap.map(DisconnectUserSignal).toCommand(DisconnectUserCommand);
signalCommandMap.map(CheckDeskshareStreamSignal).toCommand(CheckDeskshareStreamCommand);
}
}
}

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -96,6 +96,7 @@ package org.bigbluebutton.command

userSession.deskshareConnection = deskshareConnection;
deskshareService.connectDeskshareSO();
deskshareService.checkIfStreamIsPublishing(conferenceParameters.room);

chatService.sendWelcomeMessage();
chatService.getPublicChatMessages();
@@ -19,7 +19,7 @@ package org.bigbluebutton.core
private var _successConnected:ISignal = new Signal();
private var _unsuccessConnected:ISignal = new Signal();
private var _isStreamingSignal:ISignal = new Signal();
private var _cursorLocationChangedSignal:ISignal = new Signal();
private var _mouseLocationChangedSignal:ISignal = new Signal();
private var _isStreaming:Boolean;
private var _streamCheckedOnStartup:Boolean;
private var _streamWidth:Number;
@@ -97,6 +97,7 @@ package org.bigbluebutton.core
public function set isStreaming(value:Boolean):void
{
_isStreaming = value;
isStreamingSignal.dispatch(_isStreaming);
}

public function get isStreamingSignal():ISignal
@@ -106,17 +107,7 @@ package org.bigbluebutton.core

public function get mouseLocationChangedSignal():ISignal

This comment has been minimized.

Copy link
@capilkey

capilkey Jun 9, 2014

Member

The method name should be the same as the variable

{
return _cursorLocationChangedSignal;
}

public function get streamCheckedOnStartup():Boolean
{
return _streamCheckedOnStartup;
}

public function set streamCheckedOnStartup(value:Boolean):void
{
_streamCheckedOnStartup = value;
return _mouseLocationChangedSignal;
}

public function get unsuccessConnected():ISignal
@@ -128,5 +119,10 @@ package org.bigbluebutton.core
{
return _successConnected;
}

public function setMouseCoordinates(x:Number, y:Number):void
{
_mouseLocationChangedSignal.dispatch(x, y);
}
}
}
@@ -34,7 +34,6 @@ package org.bigbluebutton.core

// if we receive result from the server, then somebody is sharing their desktop - dispatch the notification signal
userSession.deskshareConnection.isStreaming = true;
userSession.deskshareConnection.isStreamingSignal.dispatch(userSession.deskshareConnection.isStreaming);
}
else
{
@@ -45,8 +45,6 @@ package org.bigbluebutton.core
userSession.deskshareConnection.streamWidth = videoWidth;
userSession.deskshareConnection.streamHeight = videoHeight;
userSession.deskshareConnection.isStreaming = true;
userSession.deskshareConnection.isStreamingSignal.dispatch(userSession.deskshareConnection.isStreaming);

}

/**
@@ -56,15 +54,14 @@ package org.bigbluebutton.core
{
trace("DeskShare-deskshareStreamStopped.");
userSession.deskshareConnection.isStreaming = false;
userSession.deskshareConnection.isStreamingSignal.dispatch(userSession.deskshareConnection.isStreaming);
}

/**
* Called by the server to notify clients that mouse location has changed
*/
public function mouseLocationCallback(x:Number, y:Number):void
{
userSession.deskshareConnection.mouseLocationChangedSignal.dispatch(x, y);
userSession.deskshareConnection.setMouseCoordinates(x, y);
}
}
}
@@ -9,8 +9,6 @@ package org.bigbluebutton.core
function get unsuccessConnected():ISignal
function get successConnected():ISignal
function get isStreamingSignal():ISignal
function get streamCheckedOnStartup():Boolean
function set streamCheckedOnStartup(value:Boolean):void
function get isStreaming():Boolean
function set isStreaming(value:Boolean):void
function onConnectionUnsuccess(reason:String):void
@@ -24,5 +22,6 @@ package org.bigbluebutton.core
function get connection():NetConnection
function connect():void
function get mouseLocationChangedSignal():ISignal;
function setMouseCoordinates(x:Number, y:Number):void;
}
}
@@ -1,6 +1,5 @@
package org.bigbluebutton.view.navigation.pages.common
{
import org.bigbluebutton.command.CheckDeskshareStreamSignal;
import org.bigbluebutton.model.IUserSession;

import robotlegs.bender.bundles.mvcs.Mediator;
@@ -13,20 +12,10 @@ package org.bigbluebutton.view.navigation.pages.common
[Inject]
public var view:MenuButtonsView;

[Inject]
public var checkDeskshareSignal:CheckDeskshareStreamSignal;

public override function initialize():void
{
// On application startup check if presenter is sharing their desktop
if (!userSession.deskshareConnection.streamCheckedOnStartup)
{
checkDeskshareSignal.dispatch();
userSession.deskshareConnection.streamCheckedOnStartup = true;
}

{
view.menuDeskshareButton.visible = view.menuDeskshareButton.includeInLayout = userSession.deskshareConnection.isStreaming;
userSession.deskshareConnection.isStreamingSignal.add(onDeskshareStreamChange);
onDeskshareStreamChange(userSession.deskshareConnection.isStreaming);
}

/**
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.