You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/11/29 09:29:28 UTC
svn commit: r1771867 - in /openmeetings/application/branches:
3.1.x/openmeetings-flash/src/main/swf/
3.1.x/openmeetings-flash/src/main/swf/video/
3.2.x/openmeetings-flash/src/main/swf/
3.2.x/openmeetings-flash/src/main/swf/video/
Author: solomax
Date: Tue Nov 29 09:29:28 2016
New Revision: 1771867
URL: http://svn.apache.org/viewvc?rev=1771867&view=rev
Log:
no jira: code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1771867&r1=1771866&r2=1771867&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Tue Nov 29 09:29:28 2016
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -99,6 +99,14 @@
return vidContainer;
</method>
+ <method name="setPartnerName" args="obj, first, last=null">
+ if (!obj) {
+ return;
+ }
+ var dispName = !last ? first : first + ' ' + last;
+ obj.setAttribute('chatpartnername', dispName);
+ </method>
+
<!--
Method that creates the video views when user(self) initially entering a room.
@@ -112,7 +120,7 @@
if(vidContainer == null) {
vidContainer = this.getNewVideoObjectByPos(publicSID);
vidContainer.clientVars = object;
- vidContainer.setAttribute('chatpartnername',displayName);
+ setPartnerName(vidContainer, displayName);
if (avsettings=="n"){
vidContainer.setVideouserProfilePic(object);
vidContainer.setAttribute("visibility","hidden");
@@ -134,10 +142,9 @@
vidContainer.updateAVSettingsSymbol(object);
if (object.micMuted) {
vidContainer.setMicMuted(object.micMuted);
- }
+ }
}
-
-
+
if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
if (canvas.isInterview && interviewPodId != null && interviewPodId > 0) {
if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
@@ -153,14 +160,14 @@
<method name="getVideoObjectByPublicSID" args="publicSID">
<![CDATA[
- //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){
+ //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];
}
}
- if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
+ if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ", publicSID);
return null;
]]>
</method>
@@ -186,7 +193,7 @@
this.broadCastViewRef = getNewVideoObjectByPos(publicSID);
this.broadCastViewRef._chatvideoinner.r.destroy();
if ($debug) Debug.write("getNewVideoObject canvas.currentClient ",publicSID, canvas.currentClient);
- this.broadCastViewRef.setAttribute('chatpartnername', canvas.currentClient.firstname + ' ' + canvas.currentClient.lastname);
+ setPartnerName(this.broadCastViewRef, canvas.currentClient.firstname, canvas.currentClient.lastname);
return this.broadCastViewRef;
]]>
</method>
@@ -346,9 +353,7 @@
if (obj == null) {
obj = this.getNewVideoObjectByPos(rcl.publicSID);
}
- if ("n" == rcl.avsettings){
- obj.setVideouserProfilePic(rcl);
- } else if ("a" == rcl.avsettings){
+ if ("n" == rcl.avsettings || "a" == rcl.avsettings) {
obj.setVideouserProfilePic(rcl);
} else {
obj.deleteVideoConfProfilePic();
@@ -378,7 +383,7 @@
if (obj != null ){
obj._chatvideoinner._videostream.playStream(value.broadCastID, -1);
obj.setDefaultVideoSize(value.VWidth, value.VHeight);
- obj.setAttribute('chatpartnername', value.firstname + ' ' + value.lastname);
+ setPartnerName(obj, value.firstname, value.lastname);
}
//we have to do this again when the stream starts, the initial video
//component does not know the interviewPodId as the user has not selected
@@ -467,13 +472,10 @@
]]>
</method>
- <method name="updateFirstLastName" args="publicSID,first,last">
- var v = getVideoObjectByPublicSID(publicSID);
- if (v != null) {
- v.setAttribute('chatpartnername', first + ' ' + last);
- }
+ <method name="updateFirstLastName" args="publicSID, first, last">
+ setPartnerName(getVideoObjectByPublicSID(publicSID), first, last);
</method>
-
+
<!-- arranges video pods -->
<method name="arrangeWindows">
<![CDATA[
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1771867&r1=1771866&r2=1771867&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Tue Nov 29 09:29:28 2016
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,9 +32,8 @@
-->
-<class name="editRecordStreamSWF10" extends="labelExplorerBox" labelid="51"
- width="680" height="540" x="14" y="-540" >
-
+<class name="editRecordStreamSWF10" extends="labelExplorerBox" labelid="51"
+ width="680" height="540" x="14" y="-540" >
<switch>
<when property="$as3">
<passthrough>
@@ -50,7 +49,6 @@
</switch>
<attribute name="myvideocontainer" value="null" />
-
<attribute name="standalone" value="false" type="boolean" />
<attribute name="initY" value="40" type="number" />
<attribute name="chosenCam" value="null" />
@@ -64,22 +62,14 @@
if true the user will see the dialog no matter if he has choosen "do not show again" or not
-->
<attribute name="isSyncUpdate" value="false" type="boolean" />
-
<attribute name="doDefaultAnimation" value="true" type="boolean" />
-
<attribute name="cam_default_width" value="320" type="number" />
<attribute name="cam_default_height" value="260" type="number" />
-
<attribute name="interviewPodId" value="0" type="number" />
-
<attribute name="lastRecorded" value="" type="string" />
-
<attribute name="isRunning" value="false" type="boolean" />
-
<attribute name="recordingsCounter" value="5" type="number" />
-
<attribute name="timerIsRunning" value="false" type="boolean" />
-
<attribute name="counterDelegate" value="null" />
<method name="startTimer">
@@ -94,7 +84,6 @@
lz.Timer.resetTimer(this.counterDelegate, 1000);
this._text._info.setAttribute("text",""+this.recordingsCounter+" sec");
-
} else {
this._text.setAttribute("visibility","hidden");
this.doStop();
@@ -121,7 +110,7 @@
}
this.counterDelegate = new LzDelegate(this, "count");
-
+
if ($debug) Debug.write("this.myvideocontainer ",this.myvideocontainer);
if ($debug) Debug.write("editrecordstream ###################### ");
@@ -152,7 +141,7 @@
}
]]>
</handler>
-
+
<!--
If the remember check-box was true, this flag in the Flash Cookie (aka SharedObject)
is true and the box will close without asking for device settings.
@@ -217,28 +206,28 @@
<netparam><method name="getValue">return canvas.publicSID;</method></netparam>
<netparam><method name="getValue">return parent.parent.interviewPodId;</method></netparam>
<handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("setUserAVSettings",value);
- parent.currentClient = value;
- parent.doStartConference();
- ]]>
+ <![CDATA[
+ if ($debug) Debug.write("setUserAVSettings",value);
+ parent.currentClient = value;
+ parent.doStartConference();
+ ]]>
</handler>
</netRemoteCallHib>
<method name="storelocaldata">
- <![CDATA[
- //if ($debug) Debug.write("sharedobject store:: [width, height] : [" + this.cam_default_width + ", " + this.cam_default_height + "]");
- var t:SharedObject = SharedObject.getLocal('userdata');
- var g = t.data;
- if (g==null) g = new Array();
- g["cam"] = this.availableCams.getValue();
- g["mic"] = this.availableMics.getValue();
- g["avstored"] = this.availableSettings.getValue();
- g["savecamdata"] = this.holddatainSO.getValue();
- g["width"] = this.cam_default_width;
- g["height"] = this.cam_default_height;
- t.flush();
- ]]>
+ <![CDATA[
+ //if ($debug) Debug.write("sharedobject store:: [width, height] : [" + this.cam_default_width + ", " + this.cam_default_height + "]");
+ var t:SharedObject = SharedObject.getLocal('userdata');
+ var g = t.data;
+ if (g==null) g = new Array();
+ g["cam"] = this.availableCams.getValue();
+ g["mic"] = this.availableMics.getValue();
+ g["avstored"] = this.availableSettings.getValue();
+ g["savecamdata"] = this.holddatainSO.getValue();
+ g["width"] = this.cam_default_width;
+ g["height"] = this.cam_default_height;
+ t.flush();
+ ]]>
</method>
<method name="getMic" args="valMic">
@@ -396,18 +385,18 @@
</method>
<method name="doPlay">
- <![CDATA[
- if (this.lastRecorded == "") {
- //Error - nothing recorded yet
- if ($debug) Debug.warn("Nothing to Play");
- } else {
- this._play.setAttribute("enabled",true);
- this._video.content._publisher.setAttribute("visibility","hidden");
- this._video.content._viewer.setAttribute("visibility","visible");
- var videoview = this._video.content._viewer._chatvideoinner._videostream;
- videoview.justPlayStream(this.lastRecorded+".flv",0);
- }
- ]]>
+ <![CDATA[
+ if (this.lastRecorded == "") {
+ //Error - nothing recorded yet
+ if ($debug) Debug.warn("Nothing to Play");
+ } else {
+ this._play.setAttribute("enabled",true);
+ this._video.content._publisher.setAttribute("visibility","hidden");
+ this._video.content._viewer.setAttribute("visibility","visible");
+ var videoview = this._video.content._viewer._chatvideoinner._videostream;
+ videoview.justPlayStream(this.lastRecorded+".flv",0);
+ }
+ ]]>
</method>
<method name="doStop">
@@ -424,9 +413,8 @@
<animator name="_chooseDeviceAnimation" started="false" attribute="y" to="40" duration="750" />
-
<labelText fontstyle="bold" labelid="758"
- width="${ parent.width-2 }" height="30" multiline="true" y="20" />
+ width="${ parent.width-2 }" height="30" multiline="true" y="20" />
<labelText labelid="447" fontsize="11" fontstyle="bold" x="10" y="80" width="$once{ parent.width-20 }" />
@@ -590,14 +578,14 @@
</method>
<method name="cleanVideos">
- if (_video == undefined) return;
- //make sure stop and clear is called, as the _stop method does not work for all
- //videoviews in the device settings.
- _video.content._publisher._chatvideoinner._videostream._stop();
- _video.content._viewer._chatvideoinner._videostream._stop();
- _video.content._publisher._chatvideoinner._videostream.clear();
- _video.content._viewer._chatvideoinner._videostream.clear();
- if ($debug) Debug.write("Cleaned up videos and free resources");
+ if (_video == undefined) return;
+ //make sure stop and clear is called, as the _stop method does not work for all
+ //videoviews in the device settings.
+ _video.content._publisher._chatvideoinner._videostream._stop();
+ _video.content._viewer._chatvideoinner._videostream._stop();
+ _video.content._publisher._chatvideoinner._videostream.clear();
+ _video.content._viewer._chatvideoinner._videostream.clear();
+ if ($debug) Debug.write("Cleaned up videos and free resources");
</method>
<labelText name="availableCamsLabel" labelid="52" fontsize="11" x="10" y="140" width="$once{ parent.width-20 }" />
@@ -610,19 +598,19 @@
<labelText name="availableMicsLabel" labelid="53" fontsize="11" x="10" y="180" width="$once{ parent.width-20 }" />
<resetCombobox fontsize="11" name="availableMics" x="10" y="200" width="280" editable="false" />
- <labelText name="infoTextNoAV" labelid="452" multiline="true" width="280"
- fontsize="11" x="10" y="130" visibility="hidden" />
-
+ <labelText name="infoTextNoAV" labelid="452" multiline="true" width="280"
+ fontsize="11" x="10" y="130" visibility="hidden" />
+
<labelText name="availibleResolutionsLabel" labelid="1429"
fontsize="11" x="10" y="224" width="$once{ parent.width-20 }" />
-
+
<view name="availibleResolutionsWarning" x="272" y="224"
resource="warning_icon_popup_devices_rsc" clickable="true">
<labelTooltip multiline="true" labelid="1430" />
- </view>
+ </view>
<resetCombobox fontsize="11" name="availibleResolutions" x="10" shownitems="10"
- y="244" width="280" editable="false">
+ y="244" width="280" editable="false">
<!--- @keywords private -->
<attribute name="counter" value="0" />
<handler name="onselect" args="item">
@@ -635,7 +623,7 @@
var py = parent.y < 0 ? 5 : parent.y;
var maxWidth = Math.min(600, canvas.width - parent.x - 10)
, maxHeight = Math.min(500, canvas.height - py - 10)
- , newWidth = maxWidth, newHeight = maxHeight;;
+ , newWidth = maxWidth, newHeight = maxHeight;
if (item.cam_width > 240) {
newWidth = maxWidth + item.cam_width - 240;
}
@@ -672,7 +660,7 @@
this.cam_width = Number(this.datapath.xpathQuery('@width'));
this.cam_height = Number(this.datapath.xpathQuery('@height'));
this.setAttribute("text",""+this.cam_width+"x"+this.cam_height+" ["+type+"]");
- var isDefault = this.datapath.xpathQuery('@isDefault');
+ var isDefault = this.datapath.xpathQuery('@isDefault') == "true";
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
@@ -684,30 +672,28 @@
parent.onselect.sendEvent(this);
}
} else {
- if (isDefault == "true") {
+ if (isDefault) {
if ($debug) Debug.write("Found default one ",type);
parent.selectItemAt(parent.counter);
parent.onselect.sendEvent(this);
}
}
- parent.counter+=1;
+ parent.counter += 1;
]]>
</handler>
</textlistitem>
- </resetCombobox>
+ </resetCombobox>
- <simpleLabelButton name="_btnStartRecording" labelid="775"
- width="140" x="150" y="280" height="28">
+ <simpleLabelButton name="_btnStartRecording" labelid="775" width="140" x="150" y="280" height="28">
<handler name="onclick">
parent._level_meter.startLevel();
parent.doStartRecording();
</handler>
</simpleLabelButton>
-
+
<view x="340" y="60" name="_video" clip="true"
width="${ parent.width-this.x-10 }" height="${ parent.height-260 }">
<view name="content">
-
<videoObjectTestBroadcast name="_publisher"
width="${ parent.parent.parent.cam_default_width }"
height="${ parent.parent.parent.cam_default_height }">
@@ -727,37 +713,32 @@
</videoObjectTestBroadcast>
<videoObjectPlayTestBroadcast name="_viewer" visibility="hidden"
- width="${ parent.parent.parent.cam_default_width }"
- height="${ parent.parent.parent.cam_default_height }" />
+ width="${ parent.parent.parent.cam_default_width }"
+ height="${ parent.parent.parent.cam_default_height }" />
</view>
<om_vscrollbar />
<om_hscrollbar />
</view>
-
<view name="_text" x="340" y="60" width="240" height="180" visibility="hidden">
- <text name="_info" resize="true" bgcolor="0xFFFFFF" align="right"
- fontsize="12" fontstyle="bold" />
+ <text name="_info" resize="true" bgcolor="0xFFFFFF" align="right" fontsize="12" fontstyle="bold" />
</view>
- <simpleLabelButton name="_play" y="${ parent.height-166 }" x="490" enabled="false"
- width="90" labelid="764" >
+ <simpleLabelButton name="_play" y="${ parent.height-166 }" x="490" enabled="false" width="90" labelid="764">
<handler name="onclick">
parent.doPlay();
</handler>
</simpleLabelButton>
-
+
<view name="_level_meter" x="340" y="${ parent.height-190 }" width="240" height="20" clip="true" bgcolor="0x000000">
-
<!--- Level delegate, used to track level changes.
@keywords private -->
<attribute name="_leveldel" value="$once{new LzDelegate(this, '_updateLevel')}"/>
<method name="_updateLevel" args="no">
<![CDATA[
- if (parent._video.content._publisher._chatvideoinner._videostream.micro == null)
- {
+ if (parent._video.content._publisher._chatvideoinner._videostream.micro == null) {
return;
}
this.setNewLevel(parent._video.content._publisher._chatvideoinner._videostream.micro.activityLevel);
@@ -790,7 +771,7 @@
<view y="${ parent.height-98 }" resource="test_setup_info_rsc" x="16" />
<labelText fontstyle="bold" labelid="765" x="39" y="${ parent.height-100 }"
- width="${ parent.width-50 }" multiline="true" />
+ width="${ parent.width-50 }" multiline="true" />
<!-- Remember Me -->
<labelCheckbox name="holddatainSO" labelid="762" x="10" y="${ parent.height-20 }" visible="${ !parent.standalone }" >
@@ -859,5 +840,5 @@
</handler>
</simpleLabelButton>
</class>
-
+
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1771867&r1=1771866&r2=1771867&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Tue Nov 29 09:29:28 2016
@@ -95,6 +95,14 @@
return vidContainer;
</method>
+ <method name="setPartnerName" args="obj, first, last=null">
+ if (!obj) {
+ return;
+ }
+ var dispName = !last ? first : first + ' ' + last;
+ obj.setAttribute('chatpartnername', dispName);
+ </method>
+
<!--
Method that creates the video views when user(self) initially entering a room.
@@ -108,7 +116,7 @@
if(vidContainer == null) {
vidContainer = this.getNewVideoObjectByPos(publicSID);
vidContainer.clientVars = object;
- vidContainer.setAttribute('chatpartnername',displayName);
+ setPartnerName(vidContainer, displayName);
if (avsettings=="n"){
vidContainer.setVideouserProfilePic(object);
vidContainer.setAttribute("visibility","hidden");
@@ -132,7 +140,7 @@
vidContainer.setMicMuted(object.micMuted);
}
}
-
+
if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
if (canvas.isInterview && interviewPodId != null && interviewPodId > 0) {
if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
@@ -181,7 +189,7 @@
this.broadCastViewRef = getNewVideoObjectByPos(publicSID);
this.broadCastViewRef._chatvideoinner.r.destroy();
if ($debug) Debug.write("getNewVideoObject canvas.currentClient ",publicSID, canvas.currentClient);
- this.broadCastViewRef.setAttribute('chatpartnername', canvas.currentClient.firstname + ' ' + canvas.currentClient.lastname);
+ setPartnerName(this.broadCastViewRef, canvas.currentClient.firstname, canvas.currentClient.lastname);
return this.broadCastViewRef;
]]>
</method>
@@ -368,7 +376,7 @@
if (obj != null ){
obj._chatvideoinner._videostream.playStream(value.broadCastID, -1);
obj.setDefaultVideoSize(value.VWidth, value.VHeight);
- obj.setAttribute('chatpartnername', value.firstname + ' ' + value.lastname);
+ setPartnerName(obj, value.firstname, value.lastname);
}
//we have to do this again when the stream starts, the initial video
//component does not know the interviewPodId as the user has not selected
@@ -412,13 +420,10 @@
]]>
</method>
- <method name="updateFirstLastName" args="publicSID,first,last">
- var v = getVideoObjectByPublicSID(publicSID);
- if (v != null) {
- v.setAttribute('chatpartnername', first + ' ' + last);
- }
+ <method name="updateFirstLastName" args="publicSID, first, last">
+ setPartnerName(getVideoObjectByPublicSID(publicSID), first, last);
</method>
-
+
<!-- arranges video pods -->
<method name="arrangeWindows">
<![CDATA[
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1771867&r1=1771866&r2=1771867&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Tue Nov 29 09:29:28 2016
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -584,7 +584,7 @@
</view>
<resetCombobox fontsize="11" name="availibleResolutions" x="10" shownitems="10"
- y="244" width="280" editable="false">
+ y="244" width="280" editable="false">
<!--- @keywords private -->
<attribute name="counter" value="0" />
<handler name="onselect" args="item">
@@ -634,7 +634,7 @@
this.cam_width = Number(this.datapath.xpathQuery('@width'));
this.cam_height = Number(this.datapath.xpathQuery('@height'));
this.setAttribute("text",""+this.cam_width+"x"+this.cam_height+" ["+type+"]");
- var isDefault = this.datapath.xpathQuery('@isDefault');
+ var isDefault = this.datapath.xpathQuery('@isDefault') == "true";
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
@@ -646,17 +646,17 @@
parent.onselect.sendEvent(this);
}
} else {
- if (isDefault == "true") {
+ if (isDefault) {
if ($debug) Debug.write("Found default one ",type);
parent.selectItemAt(parent.counter);
parent.onselect.sendEvent(this);
}
}
- parent.counter+=1;
+ parent.counter += 1;
]]>
</handler>
</textlistitem>
- </resetCombobox>
+ </resetCombobox>
<simpleLabelButton name="_btnStartRecording" labelid="775" width="140" x="150" y="280" height="28">
<handler name="onclick">
@@ -664,7 +664,7 @@
parent.doStartRecording();
</handler>
</simpleLabelButton>
-
+
<view x="340" y="60" name="_video" clip="true"
width="${ parent.width-this.x-10 }" height="${ parent.height-260 }">
<view name="content">
@@ -687,15 +687,14 @@
</videoObjectTestBroadcast>
<videoObjectPlayTestBroadcast name="_viewer" visibility="hidden"
- width="${ parent.parent.parent.cam_default_width }"
- height="${ parent.parent.parent.cam_default_height }" />
+ width="${ parent.parent.parent.cam_default_width }"
+ height="${ parent.parent.parent.cam_default_height }" />
</view>
<om_vscrollbar />
<om_hscrollbar />
</view>
-
<view name="_text" x="340" y="60" width="240" height="180" visibility="hidden">
<text name="_info" resize="true" bgcolor="0xFFFFFF" align="right" fontsize="12" fontstyle="bold" />
</view>
@@ -705,7 +704,7 @@
parent.doPlay();
</handler>
</simpleLabelButton>
-
+
<view name="_level_meter" x="340" y="${ parent.height-190 }" width="240" height="20" clip="true" bgcolor="0x000000">
<!--- Level delegate, used to track level changes.
@keywords private -->