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/02 16:18:58 UTC
svn commit: r1239664 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10:
base/remote/baseVideoView.lzx video/editRecordStreamSWF10.lzx
video/videoObjectBroadcast.lzx
Author: sebawagner
Date: Thu Feb 2 15:18:58 2012
New Revision: 1239664
URL: http://svn.apache.org/viewvc?rev=1239664&view=rev
Log:
Fix width/height of video views set by device settings dialog
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectBroadcast.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoView.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoView.lzx?rev=1239664&r1=1239663&r2=1239664&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoView.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoView.lzx Thu Feb 2 15:18:58 2012
@@ -21,11 +21,7 @@
<method name="init"><![CDATA[
super.init();
- var width = 320;
- var height = 240;
- if (this.height > 0 && this.height < 1024) height = this.height;
- if (this.width > 0 && this.width < 1024) width = this.width;
- var mc = new Video(width, height);
+ var mc = new Video(this.width, this.height);
this.sprite.addChild(mc);
this.__LZvideo = mc;
this.applySizeToVid();
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx?rev=1239664&r1=1239663&r2=1239664&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx Thu Feb 2 15:18:58 2012
@@ -133,6 +133,8 @@
var valCam = this.chosenCam;
var valMic = this.chosenMic;
var settings = this.chosenSetting;
+ this.myvideocontainer.setDefaultVideoSize(this.cam_default_width,this.cam_default_height);
+
var videoview = this.myvideocontainer._chatvideoinner._videostream;
if ($debug) Debug.write("this.myvideocontainer: ",this.myvideocontainer);
if ($debug) Debug.write(valCam,valMic,settings);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectBroadcast.lzx?rev=1239664&r1=1239663&r2=1239664&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectBroadcast.lzx Thu Feb 2 15:18:58 2012
@@ -12,29 +12,61 @@
<attribute name="interviewPodId" value="-1" />
<attribute name="ratioW" value="1" />
<attribute name="ratioH" value="1" />
+
+ <attribute name="videoInsetX" value="2" type="number" />
+ <attribute name="videoInsetY" value="21" type="number" />
+ <attribute name="bottomBarHeight" value="0" type="number" />
+
<handler name="oninit">
<![CDATA[
- //Display widget defined in mother class
- if(this.syncuser) this.syncuser.bringToFront();
this._loudness.bringToFront();
- if(this.showuser) this.showuser.bringToFront();
this._resizeview.bringToFront();
]]>
</handler>
+
+ <!---
+ Change the video resolution by chaning pod size
+ -->
+ <method name="setDefaultVideoSize" args="w,h">
+ this.setAttribute("width",w+this.videoInsetX);
+ this.isMicrophonesRoom = canvas.currentRoomObject.showMicrophoneStatus;
+ if (canvas.currentRoomObject.showMicrophoneStatus) {
+ this.setAttribute("bottomBarHeight",this._innertop.height + 1);
+ }
+ this.setAttribute("height",h+this.videoInsetY+this.bottomBarHeight);
+ </method>
- <view name="_chatvideoinner" x="1" y="20" height="${parent.height-21}" width="${parent.width-2}">
+ <view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
+ y="$once{ parent.videoInsetY-1 }"
+ height="${parent.height-parent.videoInsetY-parent.bottomBarHeight}"
+ width="${parent.width-parent.videoInsetX}">
+
<view name="r" resource="chatbgitem" x="1" y="2" stretches="both"
width="$once{parent.width}" height="$once{parent.height}" />
+
<handler name="oninit">
this.r.setAttribute('frame',5);
- this.initH = this.height;
- this.initW = this.width;
</handler>
- <baseVideoStreamDevice name="_videostream" mode="broadcast"
- width="${parent.width}" height="${parent.height}" bgcolor="black" />
+ <baseVideoStreamDevice name="_videostream" mode="broadcast">
+ <handler name="onlevel">
+ <![CDATA[
+ //if (this.level > 0) {
+ //parent._activityLevel.bringToFront();
+ //parent._activityLevel.setAttribute("visibility","visible");
+ //}
+ var fullLength = parent.height-24;
+ parent._activityLevel.setAttribute("height",this.level*(fullLength/100));
+ ]]>
+ </handler>
+ </baseVideoStreamDevice>
+
+ <view name="_activityLevel" width="6" x="2" y="2" opacity="0.5" bgcolor="0x00FF00"
+ height="0" bcolor="0xFFFFFF">
+ </view>
</view>
+
</class>