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/05 10:56:46 UTC
svn commit: r1240691 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent:
openmeetings/swf10/video/editRecordStreamSWF10.lzx
src/modules/admin/connections/roomClient.lzx
src/modules/conference/video/editRecordStream.lzx
Author: sebawagner
Date: Sun Feb 5 09:56:46 2012
New Revision: 1240691
URL: http://svn.apache.org/viewvc?rev=1240691&view=rev
Log:
OPENMEETINGS-44 remove all old audio/video components move remote calls of device settings to SWF10, cause otherwise the variables are written to the wrong session
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
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=1240691&r1=1240690&r2=1240691&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx Sun Feb 5 09:56:46 2012
@@ -92,24 +92,60 @@
}
]]>
</method>
+
+
+ <netRemoteCallHib name="getBroadCastId" funcname="getBroadCastId"
+ remotecontext="$once{ canvas.thishib }" >
+
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("getBroadCastId",value,canvas.publicSID);
+
+ parent.myvideocontainer = canvas._videoComponent.createVideoObject(canvas.publicSID, true, -1, value);
+
+ if ($debug) Debug.write("parent.setUserAVSettings -1- ",parent.chosenSetting);
+ if ($debug) Debug.write("parent.setUserAVSettings -2- ",parent.remoteMessage);
+ if ($debug) Debug.write("parent.setUserAVSettings -3- ",parent.cam_default_width);
+ if ($debug) Debug.write("parent.setUserAVSettings -4- ",parent.cam_default_height);
+
+ parent.setUserAVSettings.doCall();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <netRemoteCallHib name="setUserAVSettings" funcname="setUserAVSettings"
+ remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue">return parent.parent.chosenSetting;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.remoteMessage;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.cam_default_width;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.cam_default_height;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("setUserAVSettings",value);
+ parent.currentClient = value;
+ parent.doninitalize();
+ //canvas.videoComp_lc.send(canvas.videoComp_lc_callback_name, 'clb_setUserAVSettings', value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<!--
Called by local connection
- -->
<method name="clb_getBroadCastId" args="value">
if ($debug) Debug.write("getBroadCastId",value,canvas.publicSID);
this.myvideocontainer = canvas._videoComponent.createVideoObject(canvas.publicSID, true, -1, value);
this.myvideocontainer.setAttribute("visibility","hidden");
</method>
+ -->
<!--
Called by local connection
- -->
<method name="clb_setUserAVSettings" args="value">
if ($debug) Debug.write("setUserAVSettings",value);
this.currentClient = value;
this.doninitalize();
</method>
+ -->
<method name="storelocaldata">
<![CDATA[
@@ -490,9 +526,9 @@
this.parent.remoteMessage[0] = 'avsettings';
this.parent.remoteMessage[1] = "0";
this.parent.remoteMessage[2] = this.parent.chosenSetting;
- //this.parent.getBroadCastId.doCall();
- if ($debug) Debug.write('lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage, this.parent.cam_default_width, this.parent.cam_default_height);
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage, this.parent.cam_default_width, this.parent.cam_default_height);
+ this.parent.getBroadCastId.doCall();
+ //if ($debug) Debug.write('lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage, this.parent.cam_default_width, this.parent.cam_default_height);
+ //canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage, this.parent.cam_default_width, this.parent.cam_default_height);
</handler>
</simpleLabelButton>
@@ -514,9 +550,9 @@
this.parent.remoteMessage[0] = 'avsettings';
this.parent.remoteMessage[1] = "0";
this.parent.remoteMessage[2] = this.parent.chosenSetting;
- //this.parent.getBroadCastId.doCall();
- if ($debug) Debug.write('lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage, this.parent.cam_default_width, this.parent.cam_default_height);
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage, this.parent.cam_default_width, this.parent.cam_default_height);
+ this.parent.getBroadCastId.doCall();
+ //if ($debug) Debug.write('lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage, this.parent.cam_default_width, this.parent.cam_default_height);
+ // canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage, this.parent.cam_default_width, this.parent.cam_default_height);
</handler>
</simpleLabelButton>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx?rev=1240691&r1=1240690&r2=1240691&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx Sun Feb 5 09:56:46 2012
@@ -22,6 +22,13 @@
<!--- Admin module to configure the Conference or Audience room.-->
<class name="roomClient" extends="baseContentView">
+
+ <handler name="oninit">
+ _mainScrollBar.setAttribute("visibility","hidden");
+ </handler>
+ <handler name="ontabcontentleave">
+ _mainScrollBar.setAttribute("visibility","visible");
+ </handler>
<turnOverList name="_turnoverlist" width="780" height="${ canvas.height - 110 }"
x="2" y="0" orderby="room_id" step="50" asc="true">
@@ -80,12 +87,43 @@
</turnOverList>
- <!--
- <roomValueForm name="_roomvalueform" x="402" />
- -->
+ <text name="_header" fontstyle="bold" text="Sessionvars" x="790" y="2"/>
+ <!-- -->
+ <view name="_roomvalueform" x="790" y="20" clip="true"
+ height="${ canvas.height - 130 }" width="${ canvas.width - 790 }">
+
+ <method name="initValueFieldsByObject" args="value">
+ <![CDATA[
+ var tArray = new Array();
+ for (var eg in value) {
+ tArray.push(new Array(eg, value[eg]))
+ }
+
+ function sortByKey(a,b) {
+
+ if(a[0].toLowerCase() < b[0].toLowerCase()) return -1;
+ else if(a[0].toLowerCase() > b[0].toLowerCase()) return 1;
+ else return 0;
+
+ }
+ tArray.sort(sortByKey);
+
+ var tString = "";
+ for (var i=0;i<tArray.length;i++) {
+ tString += "" + tArray[i][0] + ": " + tArray[i][1]+ " <br/>";
+ }
+ this._contentView.setAttribute("text",tString);
+ ]]>
+ </method>
+
+ <text name="_contentView" multiline="true" selectable="true" />
+
+ <vscrollbar />
+ <hscrollbar />
+
+ </view>
+
</class>
-
-
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx?rev=1240691&r1=1240690&r2=1240691&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx Sun Feb 5 09:56:46 2012
@@ -34,88 +34,13 @@
<class name="editRecordStream">
- <attribute name="chosenSetting" value="null" />
- <attribute name="remoteMessage" value="null" />
- <attribute name="currentClient" value="null" />
-
- <attribute name="cam_default_width" value="320" type="number" />
- <attribute name="cam_default_height" value="240" type="number" />
-
- <attribute name="syncUpdate" value="false" />
- <attribute name="isInterview" value="false" type="boolean" />
-
- <!---
- Message to send to Clients
- -->
- <attribute name="objMessage" value="null" />
-
+<!--
+ Todo: Delete this wrapper class
+ -->
<handler name="oninit">
- <![CDATA[
- //this.getBroadCastId.doCall();
- var t = this;
- canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream", this.syncUpdate, this.isInterview);
- canvas.videoComp_lc.lc_getBroadCastId = function(chosenSetting,remoteMessage,cam_default_width,cam_default_height) {
- if ($debug) Debug.write("lc_getBroadCastId",chosenSetting,remoteMessage);
- t.chosenSetting = chosenSetting;
- t.remoteMessage = remoteMessage;
- t.cam_default_width = cam_default_width;
- t.cam_default_height = cam_default_height;
- t.getBroadCastId.doCall();
- };
- canvas.videoComp_lc.sendNotification = function(objMessage) {
- //if ($debug) Debug.write("Level sendNotification ",this.isgreater);
- t.objMessage = objMessage;
- t.sendMessage.doCall();
- };
- ]]>
+ canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream", this.syncUpdate, this.isInterview);
</handler>
- <netRemoteCallHib name="getBroadCastId" funcname="getBroadCastId"
- remotecontext="$once{ canvas.thishib }" >
-
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("getBroadCastId",value,canvas.publicSID);
-
- canvas.videoComp_lc.send(canvas.videoComp_lc_callback_name, 'clb_getBroadCastId', value)
-
- //canvas.setAttribute("currentMicName", Microphone.names[parent.chosenMic]);
- //canvas.setAttribute("currentCamName", Camera.names[parent.chosenCam]);
-
- if ($debug) Debug.write("parent.setUserAVSettings -1- ",parent.chosenSetting);
- if ($debug) Debug.write("parent.setUserAVSettings -2- ",parent.remoteMessage);
- if ($debug) Debug.write("parent.setUserAVSettings -3- ",parent.cam_default_width);
- if ($debug) Debug.write("parent.setUserAVSettings -4- ",parent.cam_default_height);
-
- parent.setUserAVSettings.doCall();
- ]]>
- </handler>
- </netRemoteCallHib>
-
- <netRemoteCallHib name="setUserAVSettings" funcname="setUserAVSettings"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return parent.parent.chosenSetting;</method></netparam>
- <netparam><method name="getValue">return parent.parent.remoteMessage;</method></netparam>
- <netparam><method name="getValue">return parent.parent.cam_default_width;</method></netparam>
- <netparam><method name="getValue">return parent.parent.cam_default_height;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("setUserAVSettings",value);
- parent.currentClient = value;
- //parent.doninitalize();
- canvas.videoComp_lc.send(canvas.videoComp_lc_callback_name, 'clb_setUserAVSettings', value);
- ]]>
- </handler>
- </netRemoteCallHib>
-
- <netRemoteCallHib name="sendMessage" funcname="sendMessage"
- remotecontext="$once{ canvas.thishib }" showLoading="false" >
- <netparam><method name="getValue"> return parent.parent.objMessage; </method></netparam>
- </netRemoteCallHib>
-
- <method name="close">
- this.destroy();
- </method>
</class>
</library>