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

- make client use http tunneling

Browse Source 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1860 af16638f-c34d-0410-8cfa-b39d5352b314
This commit is contained in:
Richard Alam 2009-07-10 19:43:11 +00:00
parent 56a4fe4a38
commit c57a73c647
10 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bigbluebutton-client/html-template/deskShare.jar
View File

Binary file not shown.

BIN
bigbluebutton-client/html-template/deskshareapplet-0.1.jar Normal file
View File

Binary file not shown.

7
bigbluebutton-client/html-template/index.template.html
View File

@ -86,7 +86,7 @@ if ( hasProductInstall && !hasRequestedVersion ) {
}
// -->
function startApplet(IP, roomNumber, captureX, captureY, captureWidth, captureHeight)
function startApplet(IP, roomNumber, captureX, captureY, captureWidth, captureHeight, tunnel)
{
var iframe = document.createElement("iframe");
iframe.id = "iframe";
@ -94,14 +94,15 @@ function startApplet(IP, roomNumber, captureX, captureY, captureWidth, captureHe
frames[frames.length - 1].document.write("<applet id="+ "\"DeskShareApplet\" " + "NAME=" + "\"DeskShareApplet\" " +
"height=" + "\"0\" " +"width="+ "\"0\" " +"scriptable="+ "\"true\" " +
"mayscript=" + "\"true\">" +
"<param name=" +"\"CODE\" "+ "value=" + "\"test.RunnerApplet.class\"" + "></param>"+
"<param name=" +"\"CODE\" "+ "value=" + "\"org.bigbluebutton.deskshare.client.DeskShareApplet.class\"" + "></param>"+
"<param name=" +"\"TUNNEL\" "+ "value=" + "\"" + tunnel + "\"" + "></param>"+
"<param name=" +"\"ROOM\" "+ "value=" + "\"" + roomNumber + "\"" + "></param>"+
"<param name=" +"\"IP\" " + "value=" + "\"" + IP + "\"" + "></param>"+
"<param name=" +"\"CAPTURE_WIDTH\" " + "value=" + "\"" + captureWidth + "\"" + "></param>"+
"<param name=" +"\"CAPTURE_HEIGHT\" " + "value=" + "\"" + captureHeight + "\"" + "></param>"+
"<param name=" +"\"X\" " + "value=" + "\"" + captureX + "\"" + "></param>"+
"<param name=" +"\"Y\" " + "value=" + "\"" + captureY + "\"" + "></param>"+
"<param name=" +"\"ARCHIVE\" " + "value="+ "\"deskShare.jar\"" + "></param> </applet>");
"<param name=" +"\"ARCHIVE\" " + "value="+ "\"deskshareapplet-0.1.jar\"" + "></param> </applet>");
}
function removeFrame () {

8
bigbluebutton-client/src/DeskShareModule.mxml
View File

@ -110,6 +110,14 @@
uri = uri.split("/")[2];
//Alert.show(uri);
return uri;
}
public function tunnel():Boolean {
if (_attributes.protocol == "RTMPT") {
LogUtil.debug("Use tunneling for desktop sharing");
return true;
}
return false;
}
]]>
</mx:Script>

22
bigbluebutton-client/src/conf/config.xml
View File

@ -1,50 +1,50 @@
<?xml version="1.0" ?>
<config>
<version>0.4</version>
<porttest host="localhost" application="oflaDemo"/>
<porttest host="192.168.0.136" application="oflaDemo"/>
<modules>
<module name="VideoModule" url="VideoModule.swf"
uri="rtmp://localhost/oflaDemo"
uri="rtmp://192.168.0.136/oflaDemo"
onUserJoinedEvent="START"
onUserLogoutEvent="STOP"
loadNextModule="DeskShareModule"
/>
<module name="ChatModule" url="ChatModule.swf"
uri="rtmp://localhost/bigbluebutton"
uri="rtmp://192.168.0.136/bigbluebutton"
loadNextModule="PresentationModule"
onUserJoinedEvent="START"
onUserLogoutEvent="STOP"
/>
<module name="ViewersModule" url="ViewersModule.swf"
uri="rtmp://localhost/bigbluebutton"
host="http://localhost/bigbluebutton/conference-session/enter"
uri="rtmp://192.168.0.136/bigbluebutton"
host="conf/join-mock.xml"
onAppInitEvent="LOAD" loadNextModule="ChatModule"
onAppStartEvent="START"
onUserLogoutEvent="STOP"
/>
<module name="ListenersModule" url="ListenersModule.swf"
uri="rtmp://localhost/bigbluebutton"
uri="rtmp://192.168.0.136/bigbluebutton"
recordingHost="http://localhost"
loadNextModule="VideoModule"
onUserJoinedEvent="START"
onUserLogoutEvent="STOP"
/>
<module name="PresentationModule" url="PresentationModule.swf"
uri="rtmp://localhost/bigbluebutton"
host="http://localhost"
uri="rtmp://192.168.0.136/bigbluebutton"
host="http://192.168.0.136"
loadNextModule="ListenersModule"
onUserJoinedEvent="START"
onUserLogoutEvent="STOP"
/>
<module name="DeskShareModule" url="DeskShareModule.swf"
uri="rtmp://localhost/deskShare"
uri="rtmp://192.168.0.136/deskShare"
onUserJoinedEvent="START"
onUserLogoutEvent="STOP"
/>
<!--module name="PhoneModule" url="PhoneModule.swf"
uri="rtmp://localhost/sip"
uri="rtmp://192.168.0.136/sip"
onUserJoinedEvent="START"
onUserLogoutEvent="STOP"
/-->

2
bigbluebutton-client/src/conf/join-mock.xml
View File

@ -4,7 +4,7 @@
<role>MODERATOR</role>
<conference>965e0dcb-f64c-49bd-a81c-2e7e721fa147</conference>
<room>f7e8821f-8528-4c28-994e-2db7659f9538</room>
<voicebridge>85115</voicebridge>
<voicebridge>600</voicebridge>
<mode>LIVE</mode>
<record>true</record>
</join>

10
bigbluebutton-client/src/conf/logout-mock.xml
View File

@ -1,10 +0,0 @@
<join>
<returncode>SUCCESS</returncode>
<fullname>Richard</fullname>
<role>MODERATOR</role>
<conference>11e59b6d-fe0a-4ca5-8be4-c07b85d3eff8</conference>
<room>c87bead2-d230-4887-aba2-3418fb60e5dc</room>
<voicebridge>787493</voicebridge>
<record>true</record>
<mode>LIVE</mode>
</join>

9
bigbluebutton-client/src/conf/sip-config.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<config>
<red5Url>rtmp://localhost/sip</red5Url>
<sipRealm>134.117.254.226</sipRealm>
<sipServer>134.117.254.226</sipServer>
<sipUsername>1002</sipUsername>
<sipPassword>ff3j</sipPassword>
<sipMailbox></sipMailbox>
</config>

9
bigbluebutton-client/src/org/bigbluebutton/modules/deskShare/model/business/DeskShareProxy.as
View File

@ -154,7 +154,8 @@ package org.bigbluebutton.modules.deskShare.model.business
* Invoked on the server once the clients' applet has started sharing and the server has started a video stream
*
*/
public function appletStarted():void{
public function appletStarted():void{
LogUtil.debug("Got applet started");
sendNotification(DeskShareModuleConstants.APPLET_STARTED);
}
@ -206,7 +207,7 @@ package org.bigbluebutton.modules.deskShare.model.business
*
*/
private function checkIfStreamIsPublishing():void{
nc.call("checkIfStreamIsPublishing", responder);
nc.call("deskshare.checkIfStreamIsPublishing", responder);
}
/**
@ -224,7 +225,7 @@ package org.bigbluebutton.modules.deskShare.model.business
}
);
nc.call("getVideoWidth", widthResponder);
nc.call("deskshare.getVideoWidth", widthResponder);
}
/**
@ -244,7 +245,7 @@ package org.bigbluebutton.modules.deskShare.model.business
}
);
nc.call("getVideoHeight", heightResponder);
nc.call("deskshare.getVideoHeight", heightResponder);
}
}

3
bigbluebutton-client/src/org/bigbluebutton/modules/deskShare/view/DeskShareWindowMediator.as
View File

@ -235,7 +235,8 @@ package org.bigbluebutton.modules.deskShare.view
captureHeight = Math.round(_window.dimensionsBox.box.height * DeskShareModuleConstants.SCALE - 5);
sharing = true;
ExternalInterface.call("startApplet", _module.getCaptureServerUri(), _module.getRoom(),
captureX, captureY, captureWidth, captureHeight);
captureX, captureY, captureWidth, captureHeight,
_module.tunnel().toString());
//ExternalInterface.addCallback("appletStartNotification", onAppletStart);