You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/23 19:26:08 UTC
svn commit: r1329344 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base:
mainAttributes.lzx mainMethods.lzx remote/rtmpConnection.lzx
Author: sebawagner
Date: Mon Apr 23 17:26:08 2012
New Revision: 1329344
URL: http://svn.apache.org/viewvc?rev=1329344&view=rev
Log:
OPENMEETINGS-207 Video and Audio doesnt work when using HTTPS and RTMPS on version 2 #44
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1329344&r1=1329343&r2=1329344&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx Mon Apr 23 17:26:08 2012
@@ -52,6 +52,8 @@
<attribute name="webAppRootKey" value="" type="string" />
<attribute name="httpRootKey" value="/" type="string" />
+
+ <attribute name="proxyType" value="none" type="string" />
<!---
A reference to the current screenSharingDialogContainer or
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx?rev=1329344&r1=1329343&r2=1329344&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx Mon Apr 23 17:26:08 2012
@@ -40,7 +40,9 @@
this.setAttribute('microphoneRateNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/microphoneRateNormal/text()')));
this.setAttribute('microphoneRateBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/microphoneRateBest/text()')));
- this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/text()'));
+ this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/text()'));
+
+ this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
var _url = this.getDisplayObject().loaderInfo.url;
if($debug) Debug.write("_url: ",_url);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx?rev=1329344&r1=1329343&r2=1329344&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx Mon Apr 23 17:26:08 2012
@@ -48,6 +48,8 @@
// local reference to rtmpconnection
//this._nc.t = this;
+ this._nc.proxyType = canvas.proxyType;
+
var ok = this._nc.connect(src == "null" ? null : src);
if (this.debug) {
Debug.write("*** debug ***");