Author: sebawagner
Date: Tue Feb 7 15:47:27 2012
New Revision: 1241497
URL: http://svn.apache.org/viewvc?rev=1241497&view=rev
Log:
OPENMEETINGS-52 fix icon status in new video components Fix some of the icons
and forward the userobject to the SWF10 application via LocalConnection
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mic.png
(with props)
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
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=1241497&r1=1241496&r2=1241497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
Tue Feb 7 15:47:27 2012
@@ -23,9 +23,8 @@
Invoked after the user enters the room to connect the SWF10 app to the
server via rtmp(t/s)
-->
<method name="reconnectSuccess">
- canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess",
canvas.thishib.src, canvas.publicSID);
+ canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess",
canvas.thishib.src, canvas.publicSID, hib.userobject);
</method>
-
<handler name="onismoderator" reference="canvas" args="m">
canvas.lc.send(canvas.vid_lc_name, "ismoderatorChanged", m);
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=1241497&r1=1241496&r2=1241497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Tue Feb 7 15:47:27 2012
@@ -34,6 +34,8 @@ and some more references to temp-objects
<attribute name="currentRoomObject" value="null"/>
+<attribute name="userobject" value="null"/>
+
<attribute name="webAppRootKey" value="" type="string" />
<attribute name="httpRootKey" value="/" type="string" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx?rev=1241497&r1=1241496&r2=1241497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
Tue Feb 7 15:47:27 2012
@@ -50,16 +50,12 @@
<attribute name="delay" />
<!--- @keywords private -->
<method name="createStream">
- if($debug) Debug.write("createStream: 1");
var tStream = this._findnc();
- if($debug) Debug.write("createStream: 2", tStream,tStream.connected);
if (!tStream.connected) {
if ($debug) Debug.warn("NetConnection is not connected");
}
this._ns = new NetStream(tStream);
- if($debug) Debug.write("createStream: 3", this._ns);
this._ns.client = this;
- if($debug) Debug.write("createStream: 4", this._ns.client);
</method>
<!--<handler name="onStatus" args="info"><![CDATA[-->
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1241497&r1=1241496&r2=1241497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Tue Feb 7 15:47:27 2012
@@ -22,7 +22,7 @@
var client = {};
client.t = this;
- client.reconnect = this.reconnect;
+ //client.reconnect = this.reconnect;
client.initVideoContainer = this.initVideoContainer;
client.createEditRecordStream = this.createEditRecordStream;
client.createVideoObject = this.createVideoObject;
@@ -49,11 +49,13 @@
canvas.setAttribute("lc", lc);
]]>
</handler>
-
+
+ <!--
<method name="reconnect" args="src">
canvas.thishib.setAttribute('src',src);
canvas.thishib.disconnect();
</method>
+ -->
<method name="initVideoContainer"
args="publicSID,firstName,lastName,offsetLength,videoWidth,videoHeight">
canvas.setAttribute("publicSID",publicSID);
@@ -143,9 +145,10 @@
<method name="getVideoObjectByPublicSID" args="publicSID">
<![CDATA[
- //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH:
",publicSID);
+ if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH:
",publicSID);
for (var i=0;i<this.subviews.length;i++){
+ if ($debug) Debug.write("this.subviews[i].publicSID
",this.subviews[i].publicSID);
if (this.subviews[i].publicSID==publicSID){
return this.subviews[i];
}
@@ -190,7 +193,10 @@
});
this.broadCastViewRef._chatvideoinner.r.destroy();
-
//this.broadCastViewRef.setAttribute('chatpartnername',hib.userobject.firstname+'
'+hib.userobject.lastname);
+
+ if ($debug) Debug.write("getNewVideoObject
canvas.userobject ",publicSID,canvas.userobject);
+
+
this.broadCastViewRef.setAttribute('chatpartnername',canvas.userobject.firstname+'
'+canvas.userobject.lastname);
}
return this.broadCastViewRef;
]]>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1241497&r1=1241496&r2=1241497&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Tue Feb 7 15:47:27 2012
@@ -40,9 +40,10 @@
canvas.roomTypesInitValues = value;
</method>
- <method name="reconnectSuccess" args="connection_url,publicSID">
+ <method name="reconnectSuccess" args="connection_url,publicSID,userobject">
if($debug) Debug.write("reconnectSuccess",connection_url);
canvas.publicSID = publicSID;
+ canvas.userobject = userobject;
canvas.thishib.setAttribute('src',connection_url);
canvas.thishib.connect();
</method>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1241497&r1=1241496&r2=1241497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Tue Feb 7 15:47:27 2012
@@ -75,6 +75,7 @@
this._toolbar._showusercontext.setAttribute("visibility","hidden");
this._toolbar._minimize.setAttribute("visibility","hidden");
this._resizeview.setAttribute("visibility","hidden");
+ this._innerbottom.setAttribute("visibility","hidden");
return;
}
@@ -86,6 +87,7 @@
this._resizeview.setAttribute("visibility","hidden");
this._loudness.setAttribute("visibility","hidden");
this._innertop.setAttribute("visibility","hidden");
+ this._innerbottom.setAttribute("visibility","hidden");
//return;
}
@@ -407,7 +409,8 @@
fontsize="9"/>
</view>
- <view name="_loudness" x="1" y="${parent.height - 20}">
+ <view name="_loudness" x="1"
+ y="${parent.height - 20 - ((parent._innerbottom.visible) ? 18 :
0) }">
<view x="2" y="2" name="loudness" resource="speaking"
opacity="0.2"
onmouseover="" onmouseout="" >
<labelTooltip inittwice="true" labelid="372" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1241497&r1=1241496&r2=1241497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Tue Feb 7 15:47:27 2012
@@ -276,8 +276,6 @@
break;
}
-
this.myvideocontainer.setAttribute('chatpartnername',canvas.firstName+'
'+canvas.lastName);
-
this.close();
]]>
</method>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx?rev=1241497&r1=1241496&r2=1241497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
Tue Feb 7 15:47:27 2012
@@ -9,6 +9,7 @@
<resource name="showusercontext" src="resources/1downarrow.png" />
<resource name="resyncuser_rsc" src="resources/noatunloopsong.png" />
+ <resource name="mic_rsc" src="resources/mic.png" />
<resource name="speaking" src="resources/speaking.png" />
<resource name="mute_btn_rsc">
<frame src="resources/icon_mute.png" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mic.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mic.png?rev=1241497&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/mic.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
