Revision: 4626
Author: seba.wagner
Date: Fri Nov 25 00:03:59 2011
Log: Some sample modifications to test XMLNS validation
http://code.google.com/p/openmeetings/source/detail?r=4626
Modified:
/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
/trunk/singlewebapp/test/lzx_base.xml
/trunk/singlewebapp/test/lzx_test.xml
=======================================
--- /trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Sun Nov 20 08:37:52 2011
+++ /trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Fri Nov 25 00:03:59 2011
@@ -1292,7 +1292,6 @@
<netparam><method name="getValue">return
parent.publicSID;</method></netparam>
</netRemoteCallHib>
-<!--
<netRemoteCallHib name="receiveExclusiveAudioFlag"
funcname="receiveExclusiveAudioFlag">
<netparam><method name="getValue">return
null;</method></netparam>
<handler name="ondata" args="value">
@@ -1300,15 +1299,20 @@
//The onResult-Handler will be called be the
rtmpconnection
var obj =
canvas._videocontainer.getVideoObjectByPublicSID(value.publicSID);
+ var iHaveAudio = (canvas.publicSID == value.publicSID);
for (var i=0; i<obj.parent.subviews.length; i++) {
- if (canvas.publicSID ==
obj.parent.subviews[i].publicSID) {
- if (canvas.publicSID == value.publicSID) {
-
obj.parent.subviews[i].muteMicrophone(false);
+ var itIsMyVideo = (canvas.publicSID ==
obj.parent.subviews[i].publicSID);
+ var heHasAudio = (value.publicSID ==
obj.parent.subviews[i].publicSID);
+ if (iHaveAudio) {
+ if (itIsMyVideo) {
+
obj.parent.subviews[i].simpleMuteMicrophone(false);
} else {
-
obj.parent.subviews[i].muteMicrophone(true);
+ obj.parent.subviews[i].setMicMuted(true);
}
} else {
- if (obj.parent.subviews[i].publicSID ==
value.publicSID) {
+ if (itIsMyVideo) {
+
obj.parent.subviews[i].simpleMuteMicrophone(true);
+ } else if (heHasAudio){
obj.parent.subviews[i].setMicMuted(false);
} else {
obj.parent.subviews[i].setMicMuted(true);
@@ -1318,7 +1322,6 @@
]]>
</handler>
</netRemoteCallHib>
- -->
<netRemoteCallHib name="switchMicMuted" funcname="switchMicMuted">
<attribute name="publicSID" value="" type="string" />
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Fri Nov 25 00:03:59 2011
@@ -133,7 +133,18 @@
<method name="ringring">
if ($debug) Debug.write("ringring - ringring - ringring");
</method>
-
+
+ <handler name="onkeydown" reference="lz.Keys" args="keyCode">
+ var GIVE_EXCLUSIVE_AUDIO_KEY = 123; // F12
+
+ if (GIVE_EXCLUSIVE_AUDIO_KEY == keyCode) {
+ var obj =
canvas._videocontainer.getVideoObjectByPublicSID(canvas.publicSID);
+ if (null != obj) {
+ obj._giveExclusiveAudioView._micButton.onclick.sendEvent();
+ }
+ return;
+ }
+ </handler>
</class>
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
Sun Oct 23 02:39:44 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
Fri Nov 25 00:03:59 2011
@@ -88,6 +88,7 @@
if (this.publicSID == canvas.publicSID) {
this._toolbar._resync._tip.setAttribute("labelid",610);
}
+ this._giveExclusiveAudioView.bringToFront();
]]>
@@ -447,7 +448,49 @@
</miniIconsPresenter>
-->
- </view>
+ </view>
+
+ <view name="_giveExclusiveAudioView" x="${(parent.width)*0.5 - 20}"
y="${(parent.height)*0.5 - 20}"
+ visible="false">
+ <miniIcons name="_micButton" width="40" height="40"
resource="mic_rsc" showhandcursor="true">
+ <handler name="onclick">
+ <![CDATA[
+ canvas.thishib.giveExclusiveAudio.publicSID =
parent.parent.publicSID;
+ canvas.thishib.giveExclusiveAudio.doCall();
+ ]]>
+ </handler>
+ <labelTooltip labelid="1386" />
+ </miniIcons>
+ </view>
+
+ <handler name="onmouseover">
+ <![CDATA[
+ if (this.isInterview) {
+ return;
+ }
+ if (this.minimized) {
+ return;
+ }
+ var itIsMyVideo = (canvas.publicSID == this.publicSID);
+ if (canvas.ismoderator || itIsMyVideo) {
+ this._giveExclusiveAudioView.setAttribute("visible", true);
+ }
+ ]]>
+ </handler>
+
+ <handler name="onmouseout">
+ <![CDATA[
+ if (this.isInterview) {
+ return;
+ }
+ if (this.minimized) {
+ return;
+ }
+ if (canvas.ismoderator) {
+ this._giveExclusiveAudioView.setAttribute("visible", false);
+ }
+ ]]>
+ </handler>
<dragstate name="dragger" />
<resizestate name="rs"/>
@@ -503,6 +546,17 @@
]]>
</method>
+ <method name="simpleMuteMicrophone" args="micMuted">
+ if (micMuted) {
+ if ($debug) Debug.write("############ SET GAIN 0");
+ this._chatvideoinner._videostream.micro.setGain(0);
+ } else {
+ if ($debug) Debug.write("############ SET GAIN 50");
+ this._chatvideoinner._videostream.micro.setGain(50);
+ }
+ this.setMicMuted(micMuted);
+ </method>
+
<!--
This will mute it only locally, that means on other screens
the user might be still online and loud
=======================================
--- /trunk/singlewebapp/test/lzx_base.xml Thu Nov 24 08:12:16 2011
+++ /trunk/singlewebapp/test/lzx_base.xml Fri Nov 25 00:03:59 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<canvas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="lzx_base.xsd">
-<view name="asd"/>
+<view name="asd" />
</canvas>
=======================================
--- /trunk/singlewebapp/test/lzx_test.xml Thu Nov 24 08:12:16 2011
+++ /trunk/singlewebapp/test/lzx_test.xml Fri Nov 25 00:03:59 2011
@@ -8,7 +8,7 @@
<face src="asdas" style="bold"/>
</font>
-<view onclick="asdasd">
+<view onclick="asdasd" width="${ parent.width-10 }">
</view>
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
