Author: sebawagner
Date: Sat Feb 25 12:59:55 2012
New Revision: 1293596
URL: http://svn.apache.org/viewvc?rev=1293596&view=rev
Log:
OPENMEETINGS-71 Fix device settings and video pod position for single user in
interview room type
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1293596&r1=1293595&r2=1293596&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
Sat Feb 25 12:59:55 2012
@@ -26,7 +26,7 @@
-->
<method name="showDevicePopUpInterview"
args="isSyncUpdate,interviewPodId,tx,ty,twidth,theight">
if ($debug) Debug.write("showDevicePopUpInterview
",isSyncUpdate,interviewPodId,tx,ty,twidth,theight);
- canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream",
isSyncUpdate, true, interviewPodId,tx,ty,twidth,theight);
+ canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream",
isSyncUpdate, true, interviewPodId);
</method>
<!---
@@ -34,15 +34,15 @@
@param isSyncUpdate show the popup also if the user has clicked the
"do not show again" chceckbox
-->
<method name="showDevicePopUp" args="isSyncUpdate">
- canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream",
isSyncUpdate, false, 0, 0, 0, 0, 0);
+ canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream",
isSyncUpdate, false, -1);
</method>
<!---
Invoked after the user enters the room to connect the SWF10 app to the
server via rtmp(t/s)
-->
- <method name="reconnectSuccess">
+ <method name="reconnectSuccess" args="isInterview">
if ($debug) Debug.write("Send reconnectSuccess to
",canvas.rtmp_lc_name);
- canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess",
canvas.thishib.src, canvas.publicSID, hib.userobject);
+ canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess",
canvas.thishib.src, canvas.publicSID, hib.userobject, isInterview);
</method>
<handler name="onismoderator" reference="canvas" args="m">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1293596&r1=1293595&r2=1293596&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
Sat Feb 25 12:59:55 2012
@@ -61,7 +61,7 @@
if ($debug) Debug.warn("User Reloged In ",canvas.becomemoderator);
//Send to SWF10 video-container to connect on the conference room url
//and wait for the as3ConnectionSuccess-Event
- this._videoviewcontent.reconnectSuccess();
+ this._videoviewcontent.reconnectSuccess(true);
</method>
<!---
@@ -104,7 +104,7 @@
if ($debug) Debug.write("canvas.becomemoderator:
",canvas.becomemoderator);
if ($debug) Debug.write("canvas.becomeSuperModerator:
",canvas.becomeSuperModerator);
- canvas.currentusercolor =
parent._participents.getColorForUser();
+ canvas.currentusercolor =
parent._participants.getColorForUser();
var organisation_id = 1;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1293596&r1=1293595&r2=1293596&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
Sat Feb 25 12:59:55 2012
@@ -66,7 +66,7 @@
if ($debug) Debug.write("User Reloged In");
//Send to SWF10 video-container to connect on the conference room url
//and wait for the as3ConnectionSuccess-Event
- this._videoviewcontent.reconnectSuccess();
+ this._videoviewcontent.reconnectSuccess(false);
</method>
<!---
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1293596&r1=1293595&r2=1293596&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Sat Feb 25 12:59:55 2012
@@ -50,5 +50,16 @@
<attribute name="isAllowedToRemoteControl" value="true" type="boolean"
/>
<attribute name="ismoderator" value="true" 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="340.5" type="number" />
+ <attribute name="interviewPod1_y" value="28" type="number" />
+
+ <attribute name="interviewPod2_x" value="664.5" type="number" />
+ <attribute name="interviewPod2_y" value="28" type="number" />
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1293596&r1=1293595&r2=1293596&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Sat Feb 25 12:59:55 2012
@@ -65,26 +65,34 @@
this.setAttribute("videoHeight",videoHeight);
</method>
- <method name="createEditRecordStream"
args="syncUpdate,isInterview,interviewPodId,tx,ty,twidth,theight">
- if($debug)
Debug.info("createEditRecordStream,",syncUpdate,isInterview,interviewPodId,tx,ty,twidth,theight);
+ <method name="createEditRecordStream"
args="syncUpdate,isInterview,interviewPodId">
+ if($debug)
Debug.info("createEditRecordStream,",syncUpdate,isInterview,interviewPodId);
if (canvas.inner.editRecordStream != null)
canvas.inner.editRecordStream.destroy();
new lz.editRecordStreamSWF10(canvas.inner, {
name:"editRecordStream",
isSyncUpdate:syncUpdate,
isInterview:isInterview,
- tx:tx,
- ty:ty
+ interviewPodId:interviewPodId
});
</method>
<method name="createVideoObject"
args="publicSID,isBroadcasting,interviewPodId,object">
- if($debug) Debug.info("createVideoObject, publicSID: ",publicSID,
"isBroadcasting: ", isBroadcasting);
+ if($debug) Debug.info("createVideoObject, publicSID: ",publicSID,
"isBroadcasting: ", isBroadcasting, "object", object);
var vidContainer = getVideoObjectByPublicSID(publicSID);
if(vidContainer == null) {
vidContainer = isBroadcasting ? this.getNewVideoObject(publicSID)
: this.getNewVideoObjectByPos(publicSID);
vidContainer.publicSID = publicSID;
- vidContainer.setAttribute("interviewPodId", interviewPodId);
+
+ }
+ if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
+ if (canvas.isInterview) {
+ if ($debug) Debug.write("Is interview
",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
+ vidContainer.setAttribute("interviewPodId", interviewPodId);
+
vidContainer.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
+
vidContainer.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
+ vidContainer.setAttribute("width",322);
+ vidContainer.setAttribute("height",281);
}
vidContainer.clientVars = object;
vidContainer.setAttribute('visibility','hidden');
@@ -173,8 +181,11 @@
var freePos =
this.getVideoObjectFreePos(this.offsetLength,this.videoWidth,this.videoHeight);
return new lz.videoObjectPlayBroadcast(this,{
- publicSID:publicSID, width:videoWidth,height:videoHeight,
- x:freePos[0],y:freePos[1]
+ publicSID:publicSID,
+ width:videoWidth,
+ height:videoHeight,
+ x:freePos[0],
+ y:freePos[1]
});
]]>
</method>
@@ -190,7 +201,9 @@
this.broadCastViewRef = new
lz.videoObjectBroadcast(this,{
publicSID:publicSID,
width:videoWidth,height:videoHeight,
- x:freePos[0],y:freePos[1]
+ x:freePos[0],
+ y:freePos[1],
+ isInterview:canvas.isInterview
});
this.broadCastViewRef._chatvideoinner.r.destroy();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1293596&r1=1293595&r2=1293596&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Sat Feb 25 12:59:55 2012
@@ -66,10 +66,11 @@
canvas.roomTypesInitValues = value;
</method>
- <method name="reconnectSuccess" args="connection_url,publicSID,userobject">
+ <method name="reconnectSuccess"
args="connection_url,publicSID,userobject,isInterview">
if($debug)
Debug.write("reconnectSuccess",connection_url,publicSID,userobject);
canvas.publicSID = publicSID;
canvas.userobject = userobject;
+ canvas.isInterview = isInterview;
canvas.thishib.setAttribute('src',connection_url);
canvas.thishib.connect();
</method>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1293596&r1=1293595&r2=1293596&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Sat Feb 25 12:59:55 2012
@@ -72,7 +72,6 @@
this.clientVars['User']='No User Connected';
if (this.isInterview) {
-
this._toolbar._showusercontext.setAttribute("visibility","hidden");
this._toolbar._minimize.setAttribute("visibility","hidden");
this._resizeview.setAttribute("visibility","hidden");
this._innerbottom.setAttribute("visibility","hidden");
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=1293596&r1=1293595&r2=1293596&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Sat Feb 25 12:59:55 2012
@@ -43,19 +43,10 @@
<attribute name="doDefaultAnimation" value="true" type="boolean" />
- <attribute name="isInterview" value="false" type="boolean" />
-
- <!---
- If isInterview is true the view will be placed at tx,ty and not fade in
- -->
- <attribute name="tx" value="0" type="number"/>
- <!---
- If isInterview is true the view will be placed at tx,ty and not fade in
- -->
- <attribute name="ty" value="0" type="number"/>
-
<attribute name="cam_default_width" value="320" type="number" />
<attribute name="cam_default_height" value="240" type="number" />
+
+ <attribute name="interviewPodId" value="0" type="number" />
<handler name="oninit">
<![CDATA[
@@ -88,15 +79,16 @@
//this.getBroadCastId.doCall();
canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'lc_getBroadCastId', this.chosenSetting, this.remoteMessage,
this.cam_default_width, this.cam_default_height);
} else {
- if (this.doDefaultAnimation && !this.isInterview) {
+ if (this.doDefaultAnimation && !canvas.isInterview) {
this._chooseDeviceAnimation.doStart();
}
}
}
- if (this.isInterview) {
- this.setAttribute("x",tx);
- this.setAttribute("y",ty);
+ if (canvas.isInterview) {
+ if ($debug) Debug.write("Is interview ",interviewPodId);
+
this.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
+
this.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
}
]]>
</handler>
@@ -117,7 +109,7 @@
<handler name="ondata" args="value">
<