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/02/12 11:00:38 UTC
svn commit: r1243225 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/src/base/ WebContent/src/modules/conference/ WebContent/swf10/
src/app/org/openmeetings/app/remote/red5/
Author: sebawagner
Date: Sun Feb 12 10:00:37 2012
New Revision: 1243225
URL: http://svn.apache.org/viewvc?rev=1243225&view=rev
Log:
OPENMEETINGS-47 Fix lc_SID parameter passing to ...swf8.swf
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1243225&r1=1243224&r2=1243225&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Sun Feb 12 10:00:37 2012
@@ -26,17 +26,19 @@
##########################################################
these properties will be overwritten by config.xml -->
-<attribute name="vid_lc_name" value="" type="String"/>
+<attribute name="vid_lc_name" value="" type="string"/>
+
+<attribute name="lc_SID" value="" type="string"/>
<attribute name="lc"/>
-<attribute name="rtmp_lc_name" value="" type="String"/>
+<attribute name="rtmp_lc_name" value="" type="string"/>
<attribute name="rtmp_lc"/>
-<attribute name="videoComp_lc_name" value="" type="String"/>
+<attribute name="videoComp_lc_name" value="" type="string"/>
-<attribute name="videoComp_lc_callback_name" value="" type="String"/>
+<attribute name="videoComp_lc_callback_name" value="" type="string"/>
<attribute name="videoComp_lc"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1243225&r1=1243224&r2=1243225&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Sun Feb 12 10:00:37 2012
@@ -178,19 +178,16 @@
this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
- var pMap = {};
- if($debug) Debug.write("Param query: ", _url.substr(_url.indexOf("?")+1));
- var params:Array = _url.substr(_url.indexOf('?')+1).split('&');
- for(var i:Number=0; i<params.length; i++ ) {
- if($debug) Debug.write(params[i]);
- var tokens:Array = params[i].split('=');
- pMap[tokens[0]] = tokens[1];
- if($debug) Debug.write("param: ", tokens[0], "=", tokens[1]);
+ var lc_SID = lz.Browser.getInitArg('lc_SID');
+
+ if($debug) Debug.write("lc_SID: ", lc_SID);
+
+ if (lc_SID == undefined) {
+ new lz.errorPopup(canvas,{'error':'You are loading the wrong SWF, there is no lz_SID given'});
+ return;
}
- if($debug) Debug.write("Params: ", pMap);
-
- this.setAttribute('lc_SID', pMap['lcSID']);
+ this.setAttribute('lc_SID', lc_SID);
this.setAttribute('vid_lc_name', this.lc_SID + "__videoLC");
this.setAttribute('rtmp_lc_name', this.lc_SID + "__rtmpLC");
this.setAttribute('videoComp_lc_name', this.lc_SID + "__streamLC");
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1243225&r1=1243224&r2=1243225&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx Sun Feb 12 10:00:37 2012
@@ -23,6 +23,7 @@
Invoked after the user enters the room to connect the SWF10 app to the server via rtmp(t/s)
-->
<method name="reconnectSuccess">
+ if ($debug) Debug.write("Send reconnectSuccess to ",canvas.rtmp_lc_name);
canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src, canvas.publicSID, hib.userobject);
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1243225&r1=1243224&r2=1243225&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx Sun Feb 12 10:00:37 2012
@@ -22,6 +22,7 @@
var rtmpLC:LocalConnection = new LocalConnection();
rtmpLC.connect(canvas.rtmp_lc_name);
+ if ($debug) Debug.write("Connect to LocalConnection ",canvas.rtmp_lc_name);
rtmpLC.client=client;
canvas.setAttribute("rtmp_lc", rtmpLC);
]]></handler>
@@ -41,7 +42,7 @@
</method>
<method name="reconnectSuccess" args="connection_url,publicSID,userobject">
- if($debug) Debug.write("reconnectSuccess",connection_url);
+ if($debug) Debug.write("reconnectSuccess",connection_url,publicSID,userobject);
canvas.publicSID = publicSID;
canvas.userobject = userobject;
canvas.thishib.setAttribute('src',connection_url);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?rev=1243225&r1=1243224&r2=1243225&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Sun Feb 12 10:00:37 2012
@@ -68,14 +68,18 @@
var tqueryString = "";
for (var i=0;i<tInitArgsArry.length;i++) {
- if ($debug) Debug.write(tInitArgsArry[i],lz.Browser.getInitArg(tInitArgsArry[i]));
+ // if ($debug) Debug.write(tInitArgsArry[i],lz.Browser.getInitArg(tInitArgsArry[i]));
var tValue = lz.Browser.getInitArg(tInitArgsArry[i]);
if (tValue != undefined) {
tqueryString += "&"+tInitArgsArry[i]+"="+tValue;
}
}
- var request:URLRequest = new URLRequest("maindebug.swf8.swf?lzproxied=solo&lcSID"+tqueryString);
+ var tSWFURL = "maindebug.swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
+
+ if ($debug) Debug.write("tSWFURL :: ",tSWFURL);
+
+ var request:URLRequest = new URLRequest(tSWFURL);
var loader:Loader = new Loader();
loader.load(request);
this.mainComponent.sprite.addChild(loader);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx?rev=1243225&r1=1243224&r2=1243225&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx Sun Feb 12 10:00:37 2012
@@ -70,14 +70,18 @@
var tqueryString = "";
for (var i=0;i<tInitArgsArry.length;i++) {
- if ($debug) Debug.write(tInitArgsArry[i],lz.Browser.getInitArg(tInitArgsArry[i]));
+ // if ($debug) Debug.write(tInitArgsArry[i],lz.Browser.getInitArg(tInitArgsArry[i]));
var tValue = lz.Browser.getInitArg(tInitArgsArry[i]);
if (tValue != undefined) {
tqueryString += "&"+tInitArgsArry[i]+"="+tValue;
}
}
- var request:URLRequest = new URLRequest("maindebug.swf8.swf?lzproxied=solo&lcSID"+tqueryString);
+ var tSWFURL = "maindebug.swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
+
+ if ($debug) Debug.write("tSWFURL :: ",tSWFURL);
+
+ var request:URLRequest = new URLRequest(tSWFURL);
var loader:Loader = new Loader();
loader.load(request);
this.mainComponent.sprite.addChild(loader);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1243225&r1=1243224&r2=1243225&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Sun Feb 12 10:00:37 2012
@@ -689,6 +689,8 @@ public class ScopeApplicationAdapter ext
.getClientByStreamId(streamid);
// Notify all the clients that the stream had been started
+ log.debug("start streamPublishStart broadcast start: "
+ + stream.getPublishedName() + "CONN " + current);
System.out.println("start streamPublishStart broadcast start: "
+ stream.getPublishedName() + "CONN " + current);