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/04/13 13:41:32 UTC
svn commit: r1325720 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent:
src/modules/conference/conference/roomListDetails.lzx
src/modules/conference/conference/roomListItem.lzx
swf10/video/editRecordStreamSWF10.lzx
Author: sebawagner
Date: Fri Apr 13 11:41:32 2012
New Revision: 1325720
URL: http://svn.apache.org/viewvc?rev=1325720&view=rev
Log:
OPENMEETINGS-156 6. image 4, schedules time broken?
Fix microphone rate to use 22 KHz
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx?rev=1325720&r1=1325719&r2=1325720&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx Fri Apr 13 11:41:32 2012
@@ -72,31 +72,26 @@
this._roomname.setAttribute('text',canvas.getLabelName(406)+" "+roomname);
this._roomcomment.setAttribute('text', roomcomment);
this._users.clearList();
- for (var i = 0;i<this.currentusers.length;i++){
- var username = this.currentusers[i].firstname + " "
- + this.currentusers[i].lastname
- + " (" + this.currentusers[i].username + ") ";
- new lz.userRoomTabItem(this._users._users._cbtext,{user_id:this.currentusers[i].user_id,username:username,usertime:canvas.getLabelName(408)+parseDateToStringTime(this.currentusers[i].roomEnter)});
+ if (this.currentusers != null) {
+ for (var i = 0;i<this.currentusers.length;i++){
+ var username = this.currentusers[i].firstname + " "
+ + this.currentusers[i].lastname
+ + " (" + this.currentusers[i].username + ") ";
+ new lz.userRoomTabItem(this._users._users._cbtext,{user_id:this.currentusers[i].user_id,username:username,usertime:canvas.getLabelName(408)+parseDateToStringTime(this.currentusers[i].roomEnter)});
+ }
+ }
+ this.bdatum.setAttribute("visibility", "hidden");
+ this.bzeit.setAttribute("visibility", "hidden");
+ this.edatum.setAttribute("visibility", "hidden");
+ this.ezeit.setAttribute("visibility", "hidden");
+ this.l_bdatum.setAttribute("visibility", "hidden");
+ this.l_edatum.setAttribute("visibility", "hidden");
+ if (roomid > 0) {
+ this.getAppointmentData.doCall();
}
-
- //canvas._chatcontentRPC.doinit();
- //this.addClientToChatNotification.doCall();
-
- this.getAppointmentData.doCall();
-
]]>
</method>
- <netRemoteCallHib name="addClientToChatNotification" remotecontext="$once{ canvas.thishib }"
- funcname="chatservice.addClientToChatNotification" >
- <netparam><method name="getValue">return parent.parent.roomid;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("addClientToChatNotification: ",value);
- ]]>
- </handler>
- </netRemoteCallHib>
-
<!-- Retrieving Appointmentdata for Meeting -->
<netRemoteCallHib name="getAppointmentData" remotecontext="$once{ canvas.thishib }"
funcname="conferenceservice.getAppointMentDataForRoom" >
@@ -114,33 +109,27 @@
parent.ezeit.setAttribute('text',parseDateToStringTimeOnly(value.appointmentEndtime));
- parent.bdatum.setAttribute("visibility","visible");;
- parent.bzeit.setAttribute("visibility","visible");;
- parent.edatum.setAttribute("visibility","visible");;
- parent.ezeit.setAttribute("visibility","visible");;
- parent.l_bdatum.setAttribute("visibility","visible");;
- parent.l_edatum.setAttribute("visibility","visible");;
+ parent.bdatum.setAttribute("visibility","visible");
+ parent.bzeit.setAttribute("visibility","visible");
+ parent.edatum.setAttribute("visibility","visible");
+ parent.ezeit.setAttribute("visibility","visible");
+ parent.l_bdatum.setAttribute("visibility","visible");
+ parent.l_edatum.setAttribute("visibility","visible");
if ($debug) Debug.write("Appointment Start : " + value.appointmentStarttime);
if ($debug) Debug.write("Appointment End : " + value.appointmentEndtime);
- //Do change the y-Value of the Chat and users list so that there is no white space between
- parent.user_label.setAttribute("y",110);
- parent._users.setAttribute("y",130);
- parent.chat_label.setAttribute("y",230);
- parent._chat.setAttribute("y",250);
-
} else{
parent.bdatum.setAttribute('text','');
parent.bzeit.setAttribute('text','');
- parent.bdatum.setAttribute('visible', false);
- parent.bzeit.setAttribute('visible', false);
- parent.edatum.setAttribute('visible', false);
- parent.ezeit.setAttribute('visible', false);
- parent.l_bdatum.setAttribute('visible', false);
- parent.l_edatum.setAttribute('visible', false);
+ parent.bdatum.setAttribute("visibility", "hidden");
+ parent.bzeit.setAttribute("visibility", "hidden");
+ parent.edatum.setAttribute("visibility", "hidden");
+ parent.ezeit.setAttribute("visibility", "hidden");
+ parent.l_bdatum.setAttribute("visibility", "hidden");
+ parent.l_edatum.setAttribute("visibility", "hidden");
}
]]>
@@ -167,9 +156,9 @@
<customEdittext name="bdatum" y="40" x="75" width="100" text="" visible="false" />
<customEdittext name="bzeit" x="200" y="40" width="50" regexpType="time" visible="false" />
- <labelText name="l_edatum" labelid="571" y="${40 + parent.l_bdatum.visible ? 30 : 0}" width="50" visible="false" />
- <customEdittext name="edatum" y="${parent.l_edatum.y}" x="75" width="100" text="" visible="false" />
- <customEdittext name="ezeit" x="200" y="${parent.l_edatum.y}" width="50" regexpType="time" visible="false" />
+ <labelText name="l_edatum" labelid="571" y="60" width="50" visible="false" />
+ <customEdittext name="edatum" y="60" x="75" width="100" text="" visible="false" />
+ <customEdittext name="ezeit" x="200" y="60" width="50" regexpType="time" visible="false" />
<labelText name="_roomcomment" x="75" y="${parent.l_edatum.y + (parent.l_edatum.visible ? 30 : 0)}" width="100" text=""/>
<labelText labelid="270" y="${parent._roomcomment.y}" width="50" />
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=1325720&r1=1325719&r2=1325720&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 Fri Apr 13 11:41:32 2012
@@ -74,16 +74,13 @@
if (this.ispublic) {
hib.conferencedomain = "public";
hib.currentroomid = this.obj.rooms_id;
- //Debug.write("ispublic");
} else {
hib.conferencedomain = this.obj.organisation.organisation_id;
hib.currentroomid = this.obj.room.rooms_id;
- //Debug.write("non ispublic");
}
- if ($debug) Debug.write("onclick", this);
- parent.parent.parent.parent.parent._roomlistdetails.doinit(
- this.currentusers, this.roomid, this.roomname, this.roomcomment);
}
+ parent.parent.parent.parent.parent._roomlistdetails.doinit(
+ this.currentusers, this.roomid, this.roomname, this.roomcomment);
</handler>
<method name="checkMaxUsers">
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=1325720&r1=1325719&r2=1325720&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx Fri Apr 13 11:41:32 2012
@@ -217,6 +217,7 @@
_micro.codec = SoundCodec.NELLYMOSER;
//_micro.framesPerPacket = 1;
_micro.setSilenceLevel(0, 2000);
+ _micro.rate = 22;
_micro.gain = 50;
// this has no effect if enhanced microphone is obtained
//Microphone setUseEchoSupression(bool)