Revision: 4648
Author: seba.wagner
Date: Thu Dec 1 05:41:54 2011
Log: Move exclusive audio key remote call to loading sequence
http://code.google.com/p/openmeetings/source/detail?r=4648
Modified:
/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
/trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
=======================================
--- /trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Thu Dec 1 04:45:29 2011
+++ /trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Thu Dec 1 05:41:54 2011
@@ -625,10 +625,27 @@
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
- parent.getUserSalutations.doCall();
+ parent.getGeneralOptions.doCall();
</handler>
</netRemoteCallHib>
+ <netRemoteCallHib name="getGeneralOptions"
funcname="xmlcrm.getGeneralOptions" >
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.setProgress();
+ }
+ if (value != null && value.length > 0) {
+ if ($debug) Debug.write("Give exclusive audio keycode
is: ", value[0].conf_value);
+ parent.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY',
value[0].conf_value);
+ } else {
+ if ($debug) Debug.warn("xmlcrm.getGeneralOptions
empty!");
+ }
+ parent.getUserSalutations.doCall();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
<netRemoteCallHib name="setCurrentUserOrganization"
funcname="xmlcrm.setCurrentUserOrganization">
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
<netparam><method name="getValue">return
hib.currentdomainObj.organisation_id;</method></netparam>
=======================================
--- /trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Thu Dec 1
05:41:54 2011
@@ -405,4 +405,7 @@
<attribute name="currentBaseConferenceRoom" value="null" />
+<!--F12-->
+<attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/>
+
</library>
=======================================
--- /trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx Sun
Sep 25 02:57:13 2011
+++ /trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx Thu
Dec 1 05:41:54 2011
@@ -232,10 +232,11 @@
@param number volume Number between 0 and 100
-->
<method name="setVolume" args="volume">
- if ($debug)
Debug.write(this.soundRef,volume,this.soundRef.getVolume());
+ if ($debug) Debug.write(this.soundRef,volume);
if (this.soundRef == null) {
return;
}
+ if ($debug) Debug.write(this.soundRef.getVolume());
this.soundRef.setVolume(volume);
</method>
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Thu Dec 1 04:45:29 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Thu Dec 1 05:41:54 2011
@@ -47,7 +47,6 @@
<handler name="oninit">
<![CDATA[
- this.getExclusiveAudioKeyCode.doCall();
_mainScrollBar.setAttribute("visibility","hidden");
if ($debug) Debug.write("roomobj: ",this.roomobj);
@@ -134,19 +133,9 @@
<method name="ringring">
if ($debug) Debug.write("ringring - ringring - ringring");
</method>
-
- <attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/> <!--F12-->
- <netRemoteCallHib name="getExclusiveAudioKeyCode"
funcname="getExclusiveAudioKeyCode" remotecontext="$once{ canvas.thishib }">
- <handler name="ondata" args="value">
- if (null != value) {
- if ($debug) Debug.write("Give exclusive audio keycode is
changed to: ", value);
- parent.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value);
- }
- </handler>
- </netRemoteCallHib>
-
+
<handler name="onkeydown" reference="lz.Keys" args="keyCode">
- if (this.GIVE_EXCLUSIVE_AUDIO_KEY == keyCode) {
+ if (canvas.GIVE_EXCLUSIVE_AUDIO_KEY == keyCode) {
var obj =
canvas._videocontainer.getVideoObjectByPublicSID(canvas.publicSID);
if (null != obj) {
obj._giveExclusiveAudioView._micButton.onclick.sendEvent();
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
Sat Nov 6 05:29:43 2010
+++
/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
Thu Dec 1 05:41:54 2011
@@ -5,7 +5,7 @@
layout="axis:y;spacing:2">
<attribute name="maxwidth" value="100" type="number" />
- <attribute name="maxsteps" value="19" type="number" />
+ <attribute name="maxsteps" value="20" type="number" />
<attribute name="currentsteps" value="0" type="number" />
<method name="close">
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Wed Nov 16 06:36:51 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MainService.java
Thu Dec 1 05:41:54 2011
@@ -738,6 +738,21 @@
public Configuration allowFrontendRegister(String SID) {
return cfgManagement.getConfKey(3, "allow_frontend_register");
}
+
+ public List<Configuration> getGeneralOptions(String SID) {
+ try {
+
+ List<Configuration> cList = new
LinkedList<Configuration>();
+
+ cList.add(cfgManagement.getConfKey(3,
"exclusive.audio.keycode"));
+
+ return cList;
+
+ } catch (Exception err) {
+ log.error("[getLoginOptions]",err);
+ }
+ return null;
+ }
public List<Configuration> getLoginOptions(String SID) {
try {
@@ -747,6 +762,8 @@
cList.add(cfgManagement.getConfKey(3,
"show.facebook.login"));
cList.add(cfgManagement.getConfKey(3,
"user.login.minimum.length"));
cList.add(cfgManagement.getConfKey(3,
"user.pass.minimum.length"));
+ cList.add(cfgManagement.getConfKey(3,
"user.pass.minimum.length"));
+
return cList;
} catch (Exception err) {
--
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.
