You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by gg...@apache.org on 2012/03/14 09:45:05 UTC
svn commit: r1300481 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: src/base/
src/modules/conference/ src/modules/conference/popups/
src/modules/conference/popups/doc/lzx/ja/ swf10/ swf10/video/
Author: ggrekhov
Date: Wed Mar 14 08:45:04 2012
New Revision: 1300481
URL: http://svn.apache.org/viewvc?rev=1300481&view=rev
Log:
OPENMEETINGS-77 is fixed
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/changeDevice.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/doc/lzx/ja/changedevice_doc.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
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=1300481&r1=1300480&r2=1300481&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Wed Mar 14 08:45:04 2012
@@ -400,7 +400,7 @@
//new lz.applyForModeration(canvas.main_content._content.inner);
canvas.thishib.applyForModeration.doCall();
} else if (stringSub=='editCamMicSettings') {
- new lz.changeDevice(canvas.main_content._content.inner);
+ canvas._videocontainer._videoviewcontent.changeDevice();
} else if (stringSub=='editBoardSettings') {
new lz.editWhiteboardDefault(canvas.main_content._content.inner);
} else if (stringSub=='quit') {
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=1300481&r1=1300480&r2=1300481&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx Wed Mar 14 08:45:04 2012
@@ -138,6 +138,13 @@
<method name="updateMuteStatusVideoView" args="roomClient">
canvas.lc.send(canvas.vid_lc_name, "updateMuteStatusVideoView", roomClient);
</method>
+
+ <!---
+ Shows the window with device settings
+ -->
+ <method name="changeDevice">
+ canvas.lc.send(canvas.vid_lc_name, "changeDevice");
+ </method>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx?rev=1300481&r1=1300480&r2=1300481&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx Wed Mar 14 08:45:04 2012
@@ -32,7 +32,6 @@
<include href="autoLoader.lzx" />
<include href="converterPopup.lzx" />
<include href="errorModeratorPopup.lzx" />
- <include href="changeDevice.lzx" />
<include href="syncWin.lzx" />
<include href="meetingTimer.lzx" />
<include href="incomingScreenSharing.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1300481&r1=1300480&r2=1300481&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Wed Mar 14 08:45:04 2012
@@ -42,6 +42,7 @@
client.ismoderatorChanged = this.ismoderatorChanged;
// update rights to SWF10 client
client.updateModerationFlag = this.updateModerationFlag;
+ client.changeDevice = this.changeDevice;
client.setDrawAllowStatus = this.setDrawAllowStatus
var lc:LocalConnection = new LocalConnection();
@@ -411,6 +412,18 @@
canvas.setAttribute("isAllowedToRemoteControl",canRemote);
]]>
</method>
+
+ <!---
+ Shows the window with device settings
+ -->
+ <method name="changeDevice">
+ <![CDATA[
+ if ($debug) Debug.write("changeDevice");
+ new lz.changeDevice(canvas.inner, {
+ name:"changeDeviceDialog"
+ });
+ ]]>
+ </method>
<!--
function not in use ?! swagner 04.02.2012
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx?rev=1300481&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx Wed Mar 14 08:45:04 2012
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "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
+
+ 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
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+<class name="changeDevice" extends="labelExplorerBox" labelid="51"
+ docking="true" resizeable="false" closable="true" width="300" x="14" height="260">
+
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.net.SharedObject;
+ </passthrough>
+ </when>
+ </switch>
+
+ <method name="storelocaldata">
+ <![CDATA[
+ var so:SharedObject = SharedObject.getLocal('userdata');
+ var sdata = so.data;
+ if (sdata==null) sdata = new Array();
+ sdata["cam"]=availibleCams3.getValue();
+ sdata["mic"]=availibleMics3.getValue();
+ sdata["savecamdata"] = this.holddatainSO.getValue();
+ so.flush();
+ ]]>
+ </method>
+
+ <method name="doninitalize">
+ this.storelocaldata();
+ this.close();
+ </method>
+
+ <labelText labelid="52" fontsize="11" x="10" y="30" />
+
+ <resetCombobox fontsize="11" id="availibleCams3" x="10" y="50" width="280" editable="false">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.media.Camera;
+ import flash.net.SharedObject;
+ </passthrough>
+ </when>
+ </switch>
+
+ <handler name="oninit">
+ <![CDATA[
+ //Get all availible Cam's
+ var tw = Camera.names;
+ var t = "";
+ for (var eg=0;eg<tw.length;eg++){
+ this.addItem(tw[eg],eg);
+ t=eg;
+ }
+
+ var so:SharedObject = SharedObject.getLocal('userdata');
+ var sdata = so.data;
+ var cam = sdata["cam"];
+ //Debug.write("cam: ",cam);
+
+ if (cam!=null || cam!=''){
+ this.selectItem(String(cam));
+ } else {
+ this.selectItem(t);
+ }
+ ]]>
+ </handler>
+ </resetCombobox>
+
+ <labelText text="LABEL53" labelid="53" fontsize="11" x="10" y="80" />
+
+ <resetCombobox fontsize="11" id="availibleMics3" x="10" y="100" width="280" editable="false">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.media.Microphone;
+ import flash.net.SharedObject;
+ </passthrough>
+ </when>
+ </switch>
+
+ <handler name="oninit">
+ <![CDATA[
+ //Get all availible Mic's
+ var tw = Microphone.names;
+ var t = "";
+ for (var eg=0;eg<tw.length;eg++){
+ t=eg;
+ this.addItem(tw[eg],eg);
+ }
+
+ var so:SharedObject = SharedObject.getLocal('userdata');
+ var sdata = so.data;
+ var mic = sdata["mic"];
+ //Debug.write("mic: ",mic);
+
+ if (mic!=null || mic!=''){
+ this.selectItem(String(mic));
+ } else {
+ this.selectItem(t);
+ }
+ ]]>
+ </handler>
+ </resetCombobox>
+
+ <!-- Remember Me -->
+ <labelCheckbox name="holddatainSO" labelid="762" x="10" y="220">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.net.SharedObject;
+ </passthrough>
+ </when>
+ </switch>
+
+ <handler name="oninit">
+ var so:SharedObject = SharedObject.getLocal('userdata');
+ var sdata = so.data;
+ var save = sdata["savecamdata"];
+ if ($debug) Debug.write("savecamdata save: ",save);
+ if(save) this.setValue(true);
+ </handler>
+ </labelCheckbox>
+
+ <simpleLabelButton fontsize="11" labelid="54" x="190" y="190" width="100">
+ <handler name="onclick">
+ this.parent.doninitalize();
+ </handler>
+ </simpleLabelButton>
+
+ <labelText labelid="56" width="300"
+ y="150" multiline="true" resize="false"/>
+
+ <simpleLabelButton labelid="55" width="100" x="80" y="190"
+ onclick="this.parent.close();" />
+
+</class>
+
+</library>
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=1300481&r1=1300480&r2=1300481&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx Wed Mar 14 08:45:04 2012
@@ -22,6 +22,7 @@
<resource name="lz_recorder_play" src="resources/webstart_play.png" />
+ <include href="changeDevice.lzx" />
<include href="videoUserProfilePicSWF10.lzx" />
<include href="editRecordStreamSWF10.lzx" />
<include href="baseVideoObject.lzx" />