Author: solomax
Date: Fri Dec 4 13:37:00 2015
New Revision: 1717964
URL: http://svn.apache.org/viewvc?rev=1717964&view=rev
Log:
[OPENMEETINGS-1279] interview room seems to work as expected
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/dragHelper.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
Fri Dec 4 13:37:00 2015
@@ -185,6 +185,12 @@ the LAST RoomClient Object that has been
<attribute name="removeModeratorList" value="null" />
<attribute name="ismoderator" value="false" type="boolean" />
+<attribute name="isInterview" value="false" type="boolean" />
+<!-- Those values are fixed values of the video positions of the videos from
the interview room type -->
+<attribute name="interviewPod1_x" value="320" type="number" />
+<attribute name="interviewPod1_y" value="28" type="number" />
+<attribute name="interviewPod2_x" value="644" type="number" />
+<attribute name="interviewPod2_y" value="28" type="number" />
<attribute name="loadingmessage" value="" type="string" />
<!---
@@ -237,7 +243,10 @@ the LAST RoomClient Object that has been
<attribute name="bandwidthNeededBest" value="32768" type="number" />
<attribute name="camQualityNormal" value="75" type="number" />
<attribute name="camQualityBest" value="75" type="number" />
-
+<attribute name="microphoneRateBest" value="22" type="number" />
+<attribute name="echoPath" value="128" type="number" />
+<attribute name="echoSuppression" value="true" type="string" />
+
<!--- Reference to the current active drawarea -->
<attribute name="_drawarea" value="null" />
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Fri Dec 4 13:37:00 2015
@@ -223,12 +223,16 @@
//this.setAttribute('showmodernWhiteBoard',canvas.myConfigSet.getPointer().xpathQuery('config/showmodernWhiteBoard/text()'));
//Audio-Video-Settings
+
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
this.setAttribute('codecType',canvas.myConfigSet.getPointer().xpathQuery('config/codecType/text()'));
this.setAttribute('framesPerSecond',Number(canvas.myConfigSet.getPointer().xpathQuery('config/framesPerSecond/text()')));
this.setAttribute('bandwidthNeededNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededNormal/text()')));
this.setAttribute('bandwidthNeededBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededBest/text()')));
this.setAttribute('camQualityNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/camQualityNormal/text()')));
-
this.setAttribute('camQualityBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/camQualityBest/text()')));
+
this.setAttribute('camQualityBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/camQualityBest/text()')));
+
this.setAttribute('microphoneRateBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/microphoneRateBest/text()')));
+
this.setAttribute('echoPath',Number(canvas.myConfigSet.getPointer().xpathQuery('config/echoPath/text()')));
+
this.setAttribute('echoSuppression',canvas.myConfigSet.getPointer().xpathQuery('config/echoSuppression/text()'));
this.setAttribute('defaultWhiteboardWidth',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardWidth/text()')));
this.setAttribute('defaultWhiteboardHeight',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardHeight/text()')));
@@ -574,7 +578,7 @@
-->
<method name="getIsModeratorByPublicSID" args="publicSID">
<![CDATA[
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
+ for (var i = 0; i < canvas.currentModeratorList.length; ++i) {
var item = canvas.currentModeratorList[i];
if (publicSID == item.publicSID) {
return true;
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
Fri Dec 4 13:37:00 2015
@@ -203,7 +203,7 @@
]]>
</method>
- <method name="getVideoObjectCount" args="a">
+ <method name="getVideoObjectCount">
<![CDATA[
var count = 0;
for (var i = 0; i < this.subviews.length; ++i) {
@@ -211,8 +211,7 @@
count++;
}
}
- //if ($debug) Debug.debug("COUNT :: ", count);
- canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'onInterviewPodCount', count);
+ return count;
]]>
</method>
@@ -392,19 +391,19 @@
Clear all views, probably this is called whenever a user leaves
the room for example
-->
<method name="clearAll">
- <![CDATA[
- if ($debug) Debug.write("clearAll", this.subviews);
- while(this.subviews.length > 0) {
- if (this.subviews[0]._chatvideoinner != null) {
- this.subviews[0]._chatvideoinner._videostream._stop();
- }
- this.subviews[0].destroy();
+ <![CDATA[
+ if ($debug) Debug.write("clearAll", this.subviews);
+ while(this.subviews.length > 0) {
+ if (this.subviews[0]._chatvideoinner != null) {
+ this.subviews[0]._chatvideoinner._videostream._stop();
}
- if (canvas.inner.editRecordStream != null) {
- canvas.inner.editRecordStream.destroy();
- }
- return;
- ]]>
+ this.subviews[0].destroy();
+ }
+ if (canvas.inner.editRecordStream != null) {
+ canvas.inner.editRecordStream.destroy();
+ }
+ return;
+ ]]>
</method>
<method name="setExclusiveAudioAllowStatus" args="canGiveAudio">
@@ -647,7 +646,7 @@
this[tName].destroy();
}
- new lz.playBackWhiteboardVideo(this.whiteboardVideos,{
+ new lz.playBackWhiteboardVideo(canvas.whiteboardVideos, {
name:tName,
x:tx,
y:ty,
@@ -655,20 +654,20 @@
height:theight
});
- this.whiteboardVideos[tName].playVideoStream(recordingName,0);
+ canvas.whiteboardVideos[tName].playVideoStream(recordingName,0);
]]>
</method>
- <method name="stopWhiteboardVideo" args="tName">
- <![CDATA[
- if($debug) Debug.write("stopWhiteboardVideo ",tName);
- if (this.whiteboardVideos[tName]) {
- this.whiteboardVideos[tName].stopVideo();
- this.whiteboardVideos[tName].destroy();
- } else {
- if ($debug) Debug.warn("stopWhiteboardVideo could not find
video to stop");
- }
- ]]>
+ <method name="stopWhiteboardVideo" args="tName">
+ <![CDATA[
+ if($debug) Debug.write("stopWhiteboardVideo ",tName);
+ if (canvas.whiteboardVideos[tName]) {
+ canvas.whiteboardVideos[tName].stopVideo();
+ canvas.whiteboardVideos[tName].destroy();
+ } else {
+ if ($debug) Debug.warn("stopWhiteboardVideo could not
find video to stop");
+ }
+ ]]>
</method>
<!---
@@ -735,7 +734,7 @@
canvas.screenSharingDialogContainer.destroy();
canvas.screenSharingDialogContainer = null;
}
- this.whiteboardVideos.clearAll();
+ canvas.whiteboardVideos.clearAll();
parent._videoComponent.clearAll();
]]>
</method>
@@ -779,16 +778,6 @@
<!--
Container to hold all whiteboard videos
-->
- <view name="whiteboardVideos">
- <method name="clearAll">
- <![CDATA[
- for (var eg in this.subviews) {
- this.subviews[eg].stopVideo();
- this.subviews[eg].destroy();
- }
- ]]>
- </method>
- </view>
</class>
</library>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/dragHelper.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/dragHelper.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/dragHelper.lzx
(original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/dragHelper.lzx
Fri Dec 4 13:37:00 2015
@@ -31,8 +31,10 @@
</method>
<method name="remove">
- this.dragHelper.destroy();
- this.dragHelper = null;
+ if (this.dragHelper) {
+ this.dragHelper.destroy();
+ this.dragHelper = null;
+ }
</method>
</class>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
(original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx Fri
Dec 4 13:37:00 2015
@@ -69,7 +69,9 @@
canvas.setDefaultContextMenu(cmenu);
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
- canvas.commonVideoViewContent = new
lz.commonVideoViewContentSWF10(this, {name:'_videoComponent'});
+ canvas.commonVideoViewContent = new
lz.commonVideoViewContentSWF10(this, {name:'_videoComponent'});
+ canvas.currentModeratorList = [];
+ canvas.removeModeratorList = [];
]]></handler>
<handler name="onerror" args="errmsg">
@@ -192,4 +194,14 @@
<view name="inner"></view>
+ <view name="whiteboardVideos">
+ <method name="clearAll">
+ <![CDATA[
+ while(this.subviews.length > 0) {
+ this.subviews[0].stopVideo();
+ this.subviews[0].destroy();
+ }
+ ]]>
+ </method>
+ </view>
</canvas>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx
Fri Dec 4 13:37:00 2015
@@ -127,7 +127,7 @@
<method name="initList">
- new lz.interviewListTable(this,{name:'_table'});
+ new lz.interviewListTable(this, {name:'_table'});
this.moderationPanel.bringToFront();
</method>
@@ -211,9 +211,6 @@
<moderationMiniIconsInterviewUserList name="_applyAndStatusIcons"
x="$once{ parent.width-this.width-4 }" y="2" />
- <!--
- <eventUserListTable name="_table" />
- -->
<view name="moderationPanel" height="0" clip="true"
y="${ parent.height - this.height - 2 }">
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
Fri Dec 4 13:37:00 2015
@@ -205,6 +205,22 @@
canvas.commonVideoViewContent.setSpeakingByPos(publicSID, bool);
</method>
+ <method name="receiveExclusiveAudioFlag" args="publicSID">
+ <![CDATA[
+ if ($debug) Debug.write("receiveExclusiveAudioFlag: ",publicSID);
+ var obj = this._participants.getUserListItemByPublicSID(publicSID);
+
+ for (var i = 0; i < obj.parent.subviews.length; ++i) {
+ var item = obj.parent.subviews[i];
+ var rcl = new Object();
+
+ rcl.publicSID = item.refObj.publicSID;
+ rcl.micMuted = !(publicSID == item.refObj.publicSID);
+ canvas.setMuteStatus(rcl);
+ }
+ ]]>
+ </method>
+
<!---
stops the streaming but does not destroy the view
@param int broadcastId broadcastId
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx
Fri Dec 4 13:37:00 2015
@@ -25,6 +25,7 @@
<handler name="oninit">
<![CDATA[
+ if ($debug) Debug.write(":: interviewWhiteboard :: oninit :: ",
canvas.commonVideoViewContent);
canvas._drawarea = this;
if (checkPodsDelegate == null && !_recStarted.visible) {
checkPodsDelegate = new LzDelegate(this, "checkPods");
@@ -55,13 +56,10 @@
}
</method>
- <method name="onInterviewPodCount" args="count">
- _interview._start.setAttribute("enabled", count > 0);
- </method>
-
<method name="checkPods" args="ignore=null">
- //if ($debug) Debug.write(":: Pods :: check :: ");
- canvas.commonVideoViewContent.getVideoObjectCount();
+ var count = canvas.commonVideoViewContent.getVideoObjectCount();
+ //if ($debug) Debug.write(":: Pods :: check :: ", count);
+ _interview._start.setAttribute("enabled", count > 0);
lz.Timer.resetTimer(checkPodsDelegate, 1000);
</method>
@@ -88,16 +86,11 @@
<simplelayout axis="y" spacing="2" />
- <!-- TODO add new pods
- <commonVideoViewContent name="_videoviewcontent" x="40" >
-
+ <view name="_videoviewcontent" x="40" >
<simplelayout axis="x" spacing="2" />
- -->
<interviewVideoBox name="interviewVideoBox1" interviewPodId="1" />
<interviewVideoBox name="interviewVideoBox2" x="324"
interviewPodId="2" />
- <!-- TODO add new pods
- </commonVideoViewContent>
- -->
+ </view>
<view name="_interview" align="center" visible="${ canvas.ismoderator }">
<!--
@@ -107,7 +100,9 @@
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("startInterviewRecording: ",value);
- if (!value) {
+ if (value) {
+ parent._stop.setAttribute('enabled', true);
+ } else {
new lz.labelerrorPopup(canvas,{errorlabelid:915});
}
]]>
@@ -118,7 +113,9 @@
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("stopInterviewRecording: ",value);
- if (!value) {
+ if (value) {
+ parent._stop.setAttribute('enabled', false);
+ } else {
new lz.labelerrorPopup(canvas,{errorlabelid:916});
}
]]>
@@ -127,7 +124,7 @@
<simplelayout axis="x" spacing="2" />
- <simpleLabelButton name="_start" labelid="913" height="30" width="200">
+ <simpleLabelButton name="_start" labelid="913" height="30" width="200"
enabled="false">
<handler name="onclick">
if ($debug) Debug.write("Start Recording");
parent.startInterviewRecording.doCall();
@@ -135,7 +132,7 @@
<view x="2" y="4" resource="interview_record_start" />
</simpleLabelButton>
- <simpleLabelButton name="_stop" labelid="914" height="30" width="200">
+ <simpleLabelButton name="_stop" labelid="914" height="30" width="200"
enabled="false">
<handler name="onclick">
if ($debug) Debug.write("Stop Recording");
parent.stopInterviewRecording.doCall();
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
Fri Dec 4 13:37:00 2015
@@ -183,7 +183,7 @@
if ($debug) Debug.write("receiveExclusiveAudioFlag: ",publicSID);
var obj = this._participants.getUserListItemByPublicSID(publicSID);
- for (var i=0; i<obj.parent.subviews.length; i++) {
+ for (var i = 0; i < obj.parent.subviews.length; ++i) {
var item = obj.parent.subviews[i];
var rcl = new Object();
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx?rev=1717964&r1=1717963&r2=1717964&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
Fri Dec 4 13:37:00 2015
@@ -198,7 +198,7 @@
<method name="receiveExclusiveAudioFlag" args="publicSID">
<![CDATA[
var vList = this._participants._table.renderList;
- for (var i=0;i<vList.length;i++) {
+ for (var i = 0;i < vList.length; ++i) {
var item = vList[i];
var rcl = new Object();
