BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- display screen share stream

Browse Source
This commit is contained in:
Richard Alam 2016-08-15 18:25:56 +00:00
parent c3a3bd89bf
commit 9c7759dc73
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar
View File

Binary file not shown.

4
bbb-screenshare/jws/webstart/src/main/java/org/bigbluebutton/screenshare/client/ScreenRegionSharer.java
View File

@ -143,10 +143,10 @@ public class ScreenRegionSharer implements ScreenSharer, NetworkConnectionListen
sharer.updateScreenShareInfo(x, y, width, height);
sharer.addClientListener(listener);
signalChannel.startSharing(width, height, streamId);
sharer.startSharing(streamId);
signalChannel.startSharing(width, height, streamId);
}
@Override

2
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
View File

@ -206,7 +206,7 @@ package org.bigbluebutton.modules.screenshare.managers {
private function handleStreamStartEvent(streamId:String, videoWidth:Number, videoHeight:Number):void {
LOGGER.debug("Received start vieweing command");
if (!usingJava) { return; }
//if (!usingJava) { return; }
viewWindowManager.startViewing(streamId, videoWidth, videoHeight);
}

7
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
View File

@ -259,7 +259,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
startPreviewStream(connection, streamId, width, height);
}
private function startPreviewStream(nc:NetConnection, streamId:String, capWidth:Number, capHeight:Number):void{
private function startPreviewStream(nc:NetConnection, streamId:String, capWidth:Number, capHeight:Number):void{
removeHowToHelpArea();
@ -298,8 +298,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
videoHolder.height = vidH;
video.x = videoHolder.x = (this.width - VID_WIDTH_PAD - vidW) / 2;
video.y = videoHolder.y = (this.height - VID_HEIGHT_PAD - vidH) / 2;
videoHolder.addChild(video);
this.addChild(videoHolder);
@ -433,7 +432,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
click="onHelpButtonClicked()"
tabIndex="{baseIndex+3}"/>
</mx:VBox>
<dspub:states>
<dspub:states>
<mx:State name="dispFullRegionControlBar">
<mx:AddChild>
<mx:ControlBar id="fullRegionBottomBar">