Author: sebawagner
Date: Sat Feb 25 13:41:14 2012
New Revision: 1293599
URL: http://svn.apache.org/viewvc?rev=1293599&view=rev
Log:
OPENMEETINGS-71 Fix device settings and video pod positions if two users in
interview room type
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewWhiteboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
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=1293599&r1=1293598&r2=1293599&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 13:41:14 2012
@@ -184,7 +184,7 @@
//Do init only in case this stream is NOT the same as we are
if (streamid!=canvas.streamid){
//if ($debug) Debug.write("???????? object.isBroadcasting ::
",object.isBroadcasting);
- this._videoviewcontent.createVideo(object.publicSID,
object.firstname+' '+object.lastname, object.broadCastID, object.avsettings,
-1, object);
+ this._videoviewcontent.createVideo(object.publicSID,
object.firstname+' '+object.lastname, object.broadCastID, object.avsettings,
object.interviewPodId, object);
}
//do add self too
@@ -197,7 +197,7 @@
if ($debug) Debug.write("### initializeStreams addClientItem:
",connectedSince,isMod,streamid,username,room_id,formatedDate);
if (canvas.publicSID != object.publicSID){
- this._videoviewcontent.createVideoObject(object.publicSID, false,
-1, object);
+ this._videoviewcontent.createVideoObject(object.publicSID, false,
object.interviewPodId, object);
}
//Do Add it anyway
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewWhiteboard.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewWhiteboard.lzx?rev=1293599&r1=1293598&r2=1293599&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewWhiteboard.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewWhiteboard.lzx
Sat Feb 25 13:41:14 2012
@@ -59,13 +59,8 @@
<simplelayout axis="y" spacing="2" />
- <commonVideoViewContent name="_videoviewcontent" align="center" >
+ <commonVideoViewContent name="_videoviewcontent" x="40" >
- <!--<handler name="onx" args="x">-->
- <!--interviewVideoBox1.setAttribute('x',interviewVideoBox1.x);-->
- <!--interviewVideoBox2.setAttribute('x',interviewVideoBox2.x);-->
- <!--</handler>-->
-
<simplelayout axis="x" spacing="2" />
<interviewVideoBox name="interviewVideoBox1" interviewPodId="1" >
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=1293599&r1=1293598&r2=1293599&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Sat Feb 25 13:41:14 2012
@@ -56,10 +56,10 @@
<!--
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_x" value="320" type="number" />
<attribute name="interviewPod1_y" value="28" type="number" />
- <attribute name="interviewPod2_x" value="664.5" type="number" />
+ <attribute name="interviewPod2_x" value="644" 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=1293599&r1=1293598&r2=1293599&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Sat Feb 25 13:41:14 2012
@@ -125,6 +125,16 @@
vidContainer.updateAVSettingsSymbol(object);
}
+
+ if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
+ if (canvas.isInterview && interviewPodId != null && interviewPodId
> 0) {
+ 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);
+ }
]]>
</method>
@@ -185,7 +195,8 @@
width:videoWidth,
height:videoHeight,
x:freePos[0],
- y:freePos[1]
+ y:freePos[1],
+ isInterview:canvas.isInterview
});
]]>
</method>
@@ -382,6 +393,18 @@
obj.setDefaultVideoSize(width,height);
obj.setAttribute('chatpartnername',firstname+' '+lastname);
}
+ //we have to do this again when the stream starts, the initial
video
+ //component does not know the interviewPodId as the user has not
selected
+ //which interview video pod he is going to use
+ if (canvas.isInterview && interviewPodId != null && interviewPodId
> 0) {
+ if ($debug) Debug.write("Is interview
",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
+ obj.setAttribute("interviewPodId", interviewPodId);
+
obj.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
+
obj.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
+ obj.setAttribute("width",322);
+ obj.setAttribute("height",281);
+ }
+
]]>
</method>
