Author: solomax
Date: Sat Nov 23 14:34:04 2013
New Revision: 1544810
URL: http://svn.apache.org/r1544810
Log:
Red5 HTTP port is being passed to swf10
Modified:
openmeetings/branches/2.x/WebContent/src/base/mainMethods.lzx
openmeetings/branches/2.x/WebContent/src/base/remote/rtmpConnection.lzx
openmeetings/branches/2.x/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
openmeetings/branches/2.x/WebContent/swf10/hibAdapter.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Modified: openmeetings/branches/2.x/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/base/mainMethods.lzx?rev=1544810&r1=1544809&r2=1544810&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/branches/2.x/WebContent/src/base/mainMethods.lzx Sat Nov 23
14:34:04 2013
@@ -321,7 +321,7 @@
var hasParams = _url.indexOf("?");
if (hasParams != -1) {
- cleanUrl = _url.substr(0,hasParams-1);
+ cleanUrl = _url.substr(0, hasParams);
}
if ($debug) Debug.write("_url ",_url,cleanUrl);
Modified:
openmeetings/branches/2.x/WebContent/src/base/remote/rtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/base/remote/rtmpConnection.lzx?rev=1544810&r1=1544809&r2=1544810&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/base/remote/rtmpConnection.lzx
(original)
+++ openmeetings/branches/2.x/WebContent/src/base/remote/rtmpConnection.lzx Sat
Nov 23 14:34:04 2013
@@ -107,23 +107,21 @@
have to invoke this method once again
-swagner
-->
- <method name="registerMethods">
- <![CDATA[
- if (this.subnodes!=null){
- //Register all methods which are onstanceof
netRemoteCallHib
- for (var i=0;i<this.subnodes.length;i++){
- //If it is of Type netRemoteCallHib then register
it to the NetConnection
- if (this.subnodes[i] instanceof
lz.netRemoteCallHib){
- var t = hib;
- this._nc[this.subnodes[i].funcname] = function(
args ){
- return
hib.remoteCallMethod(arguments.callee,arguments);
- //return
hib.remoteCallMethod(arguments.callee,args);
- }
- }
- }
- }
- ]]>
- </method>
+ <method name="registerMethods">
+ <![CDATA[
+ if (this.subnodes != null) {
+ //Register all methods which are instanceof
netRemoteCallHib
+ for (var i = 0; i < this.subnodes.length; ++i) {
+ //If it is of Type netRemoteCallHib then
register it to the NetConnection
+ if (this.subnodes[i] instanceof
lz.netRemoteCallHib) {
+ this._nc[this.subnodes[i].funcname] =
function(args) {
+ return
hib.remoteCallMethod(arguments.callee, arguments);
+ }
+ }
+ }
+ }
+ ]]>
+ </method>
<!--
Process the RemoteCall to the Right Funtion
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1544810&r1=1544809&r2=1544810&view=diff
==============================================================================
---
openmeetings/branches/2.x/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
(original)
+++
openmeetings/branches/2.x/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
Sat Nov 23 14:34:04 2013
@@ -67,7 +67,8 @@
-->
<method name="reconnectSuccess" args="isInterview">
if ($debug) Debug.write("Send reconnectSuccess to
",canvas.rtmp_lc_name);
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "reconnectSuccess",
[canvas.thishib.src, canvas.publicSID, hib.userobject, isInterview,
canvas.getHttpHost()]);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "reconnectSuccess",
[canvas.thishib.src, canvas.publicSID
+ , hib.userobject, isInterview, canvas.getHttpHost(),
canvas.red5httpport]);
</method>
<handler name="onismoderator" reference="canvas" args="m">
Modified: openmeetings/branches/2.x/WebContent/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/swf10/hibAdapter.lzx?rev=1544810&r1=1544809&r2=1544810&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/swf10/hibAdapter.lzx (original)
+++ openmeetings/branches/2.x/WebContent/swf10/hibAdapter.lzx Sat Nov 23
14:34:04 2013
@@ -95,9 +95,10 @@
in case its a cluster'ed OpenMeetings installation the connection_url
might point to the slave while the httphostlocal points to the master
-->
- <method name="reconnectSuccess"
args="connection_url,publicSID,userobject,isInterview,httphostlocal">
+ <method name="reconnectSuccess"
args="connection_url,publicSID,userobject,isInterview,httphostlocal,httpport">
if($debug)
Debug.write("reconnectSuccess",connection_url,publicSID,userobject);
canvas.httphostlocal = httphostlocal;
+ canvas.red5httpport = httpport;
canvas.publicSID = publicSID;
canvas.userobject = userobject;
canvas.isInterview = isInterview;
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1544810&r1=1544809&r2=1544810&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Sat Nov
23 14:34:04 2013
@@ -321,7 +321,7 @@
var hasParams = _url.indexOf("?");
if (hasParams != -1) {
- cleanUrl = _url.substr(0,hasParams-1);
+ cleanUrl = _url.substr(0, hasParams);
}
if ($debug) Debug.write("_url ",_url,cleanUrl);
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx?rev=1544810&r1=1544809&r2=1544810&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/remote/rtmpConnection.lzx
Sat Nov 23 14:34:04 2013
@@ -107,23 +107,21 @@
have to invoke this method once again
-swagner
-->
- <method name="registerMethods">
- <![CDATA[
- if (this.subnodes!=null){
- //Register all methods which are onstanceof
netRemoteCallHib
- for (var i=0;i<this.subnodes.length;i++){
- //If it is of Type netRemoteCallHib then register
it to the NetConnection
- if (this.subnodes[i] instanceof
lz.netRemoteCallHib){
- var t = hib;
- this._nc[this.subnodes[i].funcname] = function(
args ){
- return
hib.remoteCallMethod(arguments.callee,arguments);
- //return
hib.remoteCallMethod(arguments.callee,args);
- }
- }
- }
- }
- ]]>
- </method>
+ <method name="registerMethods">
+ <![CDATA[
+ if (this.subnodes != null) {
+ //Register all methods which are instanceof
netRemoteCallHib
+ for (var i = 0; i < this.subnodes.length; ++i) {
+ //If it is of Type netRemoteCallHib then
register it to the NetConnection
+ if (this.subnodes[i] instanceof
lz.netRemoteCallHib) {
+ this._nc[this.subnodes[i].funcname] =
function(args) {
+ return
hib.remoteCallMethod(arguments.callee, arguments);
+ }
+ }
+ }
+ }
+ ]]>
+ </method>
<!--
Process the RemoteCall to the Right Funtion
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1544810&r1=1544809&r2=1544810&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
Sat Nov 23 14:34:04 2013
@@ -67,7 +67,8 @@
-->
<method name="reconnectSuccess" args="isInterview">
if ($debug) Debug.write("Send reconnectSuccess to
",canvas.rtmp_lc_name);
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "reconnectSuccess",
[canvas.thishib.src, canvas.publicSID, hib.userobject, isInterview,
canvas.getHttpHost()]);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "reconnectSuccess",
[canvas.thishib.src, canvas.publicSID
+ , hib.userobject, isInterview, canvas.getHttpHost(),
canvas.red5httpport]);
</method>
<handler name="onismoderator" reference="canvas" args="m">
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1544810&r1=1544809&r2=1544810&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx Sat Nov 23
14:34:04 2013
@@ -95,9 +95,10 @@
in case its a cluster'ed OpenMeetings installation the connection_url
might point to the slave while the httphostlocal points to the master
-->
- <method name="reconnectSuccess"
args="connection_url,publicSID,userobject,isInterview,httphostlocal">
+ <method name="reconnectSuccess"
args="connection_url,publicSID,userobject,isInterview,httphostlocal,httpport">
if($debug)
Debug.write("reconnectSuccess",connection_url,publicSID,userobject);
canvas.httphostlocal = httphostlocal;
+ canvas.red5httpport = httpport;
canvas.publicSID = publicSID;
canvas.userobject = userobject;
canvas.isInterview = isInterview;
