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/12/11 08:24:16 UTC
svn commit: r1420018 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: src/base/
src/modules/conference/conference/ src/modules/conference/testsetup/
src/modules/invitation/ swf10/audioVideoTest/ swf10/video/
Author: sebawagner
Date: Tue Dec 11 07:24:14 2012
New Revision: 1420018
URL: http://svn.apache.org/viewvc?rev=1420018&view=rev
Log:
OPENMEETINGS-460 Prepare method to load server object in cluster mode
Change implementation of default mic/cam in test+device settings dialog
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.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=1420018&r1=1420017&r2=1420018&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Tue Dec 11 07:24:14 2012
@@ -575,8 +575,6 @@
<method name="setRoomValues" args="roomTypeId,roomId,roomObj">
- //FIXME: Modify canvas.rtmphostlocal to point to cluster
-
if ($debug) Debug.warn("setRoomValues ",roomTypeId,roomId,roomObj);
if (roomTypeId==1){
canvas.isConference = true;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx?rev=1420018&r1=1420017&r2=1420018&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx Tue Dec 11 07:24:14 2012
@@ -123,8 +123,6 @@
<method name="initRoom">
if ($debug) Debug.write("roomListItem::initRoom ", this);
- //FIXME: Modify canvas.rtmphostlocal to point to cluster
-
canvas.isConference = !this.isaudience;
if (this.isaudience)
connectedIsAudience = '_' + 'audi';
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx?rev=1420018&r1=1420017&r2=1420018&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx Tue Dec 11 07:24:14 2012
@@ -23,35 +23,16 @@
<!--
#########################################
-Test the setup values before you enter a room
+Test the setup values before you enter a room => is moved to the SWF10 app
- -->
+The only thing remaining here to do, is to load the correct server
+RTMP-host, RTMP/RTMPT-port for the session
-<!--
-<class name="simpleLabelRoundButtonIcon" extends="simpleLabelRoundButton"
- height="26" fontstyle="bold" >
-
- <attribute name="ressourceIcon" value="" type="string" />
- <attribute name="tlabelid" value="0" type="number" />
-
- <view name="_iconView" x="14" y="3" resource="$once{ parent.ressourceIcon }" />
-
- <labelText y="4" x="36" labelid="$once{ parent.tlabelid }" resize="true" />
-
- <handler name="onmouseover">
- this._iconView.setAttribute("opacity",0.5);
- </handler>
-
- <handler name="onmouseout">
- this._iconView.setAttribute("opacity",1);
- </handler>
-
-</class>
-->
-<class name="testSetup" extends="labelExplorerBox" labelid="757" allowDragging="false"
- x="$once{ parent.width/2 - 300 }" y="100" docking="true" resizeable="false"
- closable="false" width="600" height="400">
+<class name="testSetup" extends="view"
+ x="$once{ parent.width/2 - 300 }" y="100"
+ width="600" height="400">
<attribute name="roomClassName" type="string" value="" />
@@ -65,94 +46,44 @@ Test the setup values before you enter a
then the window just closed -->
<attribute name="doJustClose" value="false" type="boolean" />
- <!--
-
- <method name="justClose">
- this._enterMeeting.setAttribute("enabled",false);
- this._cancel.setAttribute("enabled",false);
- this.doJustClose = true;
- canvas._loadingAll.hideLoading();
- if ($debug) Debug.write("canvas.rtmp_lc_name", canvas.rtmp_lc_name, "closeInitTestingApplication");
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "closeInitTestingApplication", null);
- </method>
-
- <method name="closeInitTestingApplicationConfirm">
- if ($debug) Debug.write("closeInitTestingApplicationConfirm ");
- if (this.doJustClose) {
- this.close();
- } else {
- this.startConference();
- }
- </method>
-
- <method name="storeSettings">
- <![CDATA[
- this._enterMeeting.setAttribute("enabled",false);
- this._cancel.setAttribute("enabled",false);
- canvas._loadingAll.hideLoading();
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "closeInitTestingApplication", null);
-
- Debug.write("sharedobject store ");
- var g = canvas.getUserData();
- g["showAudioVideoTest"] = this.holddatainSO.getValue();
- canvas.setUserData(g);
-
- ]]>
- </method>
-
- -->
-
<handler name="oninit">
<![CDATA[
- this.startConference();
- //The pre-test is disabled as its integrated into the choose device settings now
- return;
+ this.getServerForSession.doCall();
]]>
</handler>
- <method name="getServerForSession">
-
- </method>
+ <!--
+ public Server getServerForSession(String SID, long roomId)
+ -->
+ <netRemoteCallHib name="getServerForSession" funcname="conferenceservice.getServerForSession" remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue"> return canvas.sessionId; </method></netparam>
+ <netparam><method name="getValue"> return parent.parent.roomObj.rooms_id; </method></netparam>
+ <handler name="ondata" args="value">
+ if ($debug) Debug.write("getServerForSession ",value);
+ //if return value is null, everything stays the same, session is on the current host
+ if (value != null){
+ //FIXME load config from slave server first, cause the slave could potentially
+ //have other RTMP and RTMPT ports configured.
+ }
+ this.parent.startConference();
+ </handler>
+ </netRemoteCallHib>
<method name="startConference">
<;
+ this.destroy();
]]>
</method>
- <!-- Remember Me
- <labelCheckbox name="holddatainSO" labelid="759" x="10" y="$once{ parent.height-24 }" >
- <handler name="oninit">
- var g = canvas.getUserData();
- var save = g["showAudioVideoTest"];
- if ($debug) Debug.write("savecamdata save: ",save);
- if(save) this.setValue(true);
- </handler>
- </labelCheckbox>
-
- <simpleLabelButton name="_enterMeeting" labelid="761" width="160" x="$once{ parent.width-270 }"
- y="$once{ parent.height-30 }" height="28"
- onclick="this.parent.storeSettings();">
- </simpleLabelButton>
-
- <simpleLabelButton name="_cancel" labelid="760" width="100" x="$once{ parent.width-105 }"
- y="$once{ parent.height-30 }" height="28"
- onclick="this.parent.justClose();" />
- -->
-
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx?rev=1420018&r1=1420017&r2=1420018&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx Tue Dec 11 07:24:14 2012
@@ -131,8 +131,6 @@
clearStageContent();
parent.close();
- //FIXME: Modify canvas.rtmphostlocal to point to cluster
-
if (canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==1){
new lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:canvas.thishib.currentInvitation.room});
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx?rev=1420018&r1=1420017&r2=1420018&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx Tue Dec 11 07:24:14 2012
@@ -104,8 +104,6 @@
var roomObj = canvas.thishib.currentInvitation.room;
hib.currentroomid = roomObj.rooms_id;
- //FIXME: Modify canvas.rtmphostlocal to point to cluster
-
</method>
<method name="login">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx?rev=1420018&r1=1420017&r2=1420018&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx Tue Dec 11 07:24:14 2012
@@ -271,13 +271,18 @@ Test the setup values before you enter a
var g = t.data;
var mic;
if (g != null){
+ if ($debug) Debug.write("Select mic 4: ",mic);
mic = g["mic"];
if (mic == 'undefined') {
+ if ($debug) Debug.write("Select mic 3: ",mic);
mic = r;
}
} else {
+ if ($debug) Debug.write("Select mic 2: ",mic);
mic = r;
}
+ if ($debug) Debug.write("Select mic 1: ",mic);
+
this.selectItem(String(mic));
]]>
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1420018&r1=1420017&r2=1420018&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx Tue Dec 11 07:24:14 2012
@@ -552,25 +552,33 @@
</switch>
<handler name="oninit">
<![CDATA[
+ //Get eventually stored camera
+ var t:SharedObject = SharedObject.getLocal('userdata');
+ var g = t.data;
+ var cam;
+ if (g != null){
+ cam = ""+g["cam"];
+ }
+
//Get all availible Cam's
var tw = Camera.names;
var r = "";
+ var foundStoredCam = null;
for (var eg=0;eg<tw.length;eg++){
this.addItem(tw[eg],eg);
- r=eg;
+ r=""+eg;
+ if (r == cam) {
+ foundStoredCam = r;
+ }
+ }
+
+ if (foundStoredCam != null) {
+ this.selectItem(foundStoredCam);
+ } else {
+ if (tw.length > 0) {
+ this.selectItemAt(0);
+ }
}
- var t:SharedObject = SharedObject.getLocal('userdata');
- var g = t.data;
- var cam;
- if (g != null){
- cam = g["cam"];
- if (cam == 'undefined') {
- cam = r;
- }
- } else {
- cam = r;
- }
- this.selectItem(String(cam));
]]>
</handler>
</resetCombobox>
@@ -589,26 +597,35 @@
</switch>
<handler name="oninit">
<![CDATA[
+ //Get eventually stored mic from user settings/shared object/cookie
+ var t:SharedObject = SharedObject.getLocal('userdata');
+ var g = t.data;
+ var mic = null;
+ if (g != null) {
+ mic = "" + g["mic"];
+ }
+
//Get all availible Mic's
var tw = Microphone.names;
var r = "";
+ var foundStoredMic = null;
for (var eg=0;eg<tw.length;eg++){
- r=eg;
+ r = "" + eg;
this.addItem(tw[eg],eg);
+
+ if (r == mic) {
+ foundStoredMic = r;
+ }
}
- var t:SharedObject = SharedObject.getLocal('userdata');
- var g = t.data;
- var mic;
- if (g != null){
- mic = g["mic"];
- if (mic == 'undefined') {
- mic = r;
- }
+ if ($debug) Debug.write("Select foundStoredMic: ",foundStoredMic);
+ if (foundStoredMic != null) {
+ this.selectItem(foundStoredMic);
} else {
- mic = r;
+ if (tw.length > 0) {
+ this.selectItemAt(0);
+ }
}
- this.selectItem(String(mic));
]]>
</handler>
</resetCombobox>