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/02/04 18:01:53 UTC
svn commit: r1240548 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: openmeetings/swf10/
openmeetings/swf10/base/remote/ openmeetings/swf10/video/ src/base/
src/base/hibernate/ src/base/remote/ src/modules/conference/
src/modules/conference...
Author: sebawagner
Date: Sat Feb 4 17:01:52 2012
New Revision: 1240548
URL: http://svn.apache.org/viewvc?rev=1240548&view=rev
Log:
OPENMEETINGS-44 remove all old audio/video components comment out old components, start fixing the references and the participants.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectPlayBroadcast.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/moderationMiniIconsEventUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx Sat Feb 4 17:01:52 2012
@@ -52,7 +52,10 @@
<method name="createStream">
if($debug) Debug.write("createStream: 1");
var tStream = this._findnc();
- if($debug) Debug.write("createStream: 2", tStream);
+ if($debug) Debug.write("createStream: 2", tStream,tStream.connected);
+ if (!tStream.connected) {
+ if ($debug) Debug.warn("NetConnection is not connected");
+ }
this._ns = new NetStream(tStream);
if($debug) Debug.write("createStream: 3", this._ns);
this._ns.client = this;
@@ -80,6 +83,9 @@
<!--- Find the Flash NetConnection object.
@keywords private -->
<method name="_findnc">
+ if (canvas.currentNC == null) {
+ if ($debug) Debug.warn("canvas.currentNC is NULL, maybe connection did fail?");
+ }
return canvas.currentNC;
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx Sat Feb 4 17:01:52 2012
@@ -34,9 +34,6 @@
Debug.write("*** debug ***");
}
- //canvas.currentNC is the reference to the NetConnection that is used in the NetStream
- canvas.currentNC = this._nc;
-
this._nc.addEventListener(NetStatusEvent.NET_STATUS, _onStatus);
if($debug) Debug.write("devRtmpConnection/registerMethods()");
@@ -56,7 +53,9 @@
case "NetConnection.Connect.Success": {
// The connection attempt succeeded.
+ //canvas.currentNC is the reference to the NetConnection that is used in the NetStream
msg = stats.info.code;
+ canvas.currentNC = this._nc;
s = 2;
break;
}
@@ -64,6 +63,7 @@
case "NetConnection.Connect.Closed": {
msg = stats.info.code;
this._nc = null;
+ canvas.currentNC = null;
s = 0;
break;
}
@@ -88,7 +88,7 @@
</method>
<method name="disconnect">
- canvas.currentNC = null;
+ if ($debug) Debug.write(" DISCONNECT ");
if (this._nc != null) {
this._nc.close();
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/commonVideoViewContentSWF10.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/commonVideoViewContentSWF10.lzx Sat Feb 4 17:01:52 2012
@@ -39,7 +39,7 @@
client.clearAll = this.clearAll;
client.removeVideoByUser = this.removeVideoByUser;
client.muteSound = this.muteSound;
- client.videoOnMove = this.videoOnMove;
+ // client.videoOnMove = this.videoOnMove; function not in use ?! swagner 04.02.2012
client.updateMuteStatusVideoView = this.updateMuteStatusVideoView;
client.ismoderatorChanged = this.ismoderatorChanged;
@@ -75,7 +75,7 @@
});
</method>
- <method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId">
+ <method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId,object">
if($debug) Debug.info("createVideoObject, publicSID: ",publicSID, "isBroadcasting: ", isBroadcasting);
var vidContainer = getVideoObjectByPublicSID(publicSID);
if(vidContainer == null) {
@@ -83,34 +83,63 @@
vidContainer.publicSID = publicSID;
vidContainer.setAttribute("interviewPodId", interviewPodId);
}
+ vidContainer.clientVars = object;
vidContainer.setAttribute('visibility','hidden');
return vidContainer;
</method>
- <method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId">
+ <method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId,object">
<![CDATA[
if($debug) Debug.info("createVideo, publicSID: ",publicSID,"broadcastId: ",broadcastId,"AVsettings: ",avsettings);
+ if ($debug) Debug.write(" createVideo ALL vars ",object);
var vidContainer = getVideoObjectByPublicSID(publicSID);
if(vidContainer == null) {
vidContainer = this.getNewVideoObjectByPos(publicSID);
+ vidContainer.clientVars = object;
vidContainer.setAttribute('chatpartnername',displayName);
if (avsettings=="n"){
- //vidContainer.setVideouserProfilePic(object);
+ vidContainer.setVideouserProfilePic(object);
} else if (avsettings=="a"){
- //vidContainer.setVideouserProfilePic(object);
+ vidContainer.setVideouserProfilePic(object);
if ($debug) Debug.warn("start play");
vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
vidContainer.setAttribute("visibility","visible");
} else {
+ vidContainer.setDefaultVideoSize(object.VWidth,object.VHeight);
vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
vidContainer.setAttribute("visibility","visible");
}
//vidContainer.updateAVSettingsSymbol(object);
vidContainer.setAttribute("interviewPodId", interviewPodId);
+
+ vidContainer.updateAVSettingsSymbol(object);
}
]]>
</method>
+
+ <!--
+ <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
+ <![CDATA[
+ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
+
+ if (canvas.publicSID != object.publicSID){
+
+
+ var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID);
+ myvideocontainer.clientVars = object;
+ myvideocontainer.setAttribute('chatpartnername',object.firstname+' '+object.lastname);
+ if ($debug) Debug.write("addClientItem avsettings: ",object.avsettings);
+ if (object.avsettings=="n" || object.avsettings=="a"){
+ myvideocontainer.setVideouserProfilePic(object);
+ }
+ myvideocontainer.updateAVSettingsSymbol(object);
+
+ }
+
+ ]]>
+ </method>
+ -->
<method name="getVideoObjectByPublicSID" args="publicSID">
<![CDATA[
@@ -310,27 +339,17 @@
} else if (rcl.avsettings=="a"){
obj.setVideouserProfilePic(rcl);
obj.setAttribute("visibility","hidden");
- //TODO: fixme: startStream must be called by rtmp
- // For some reason the method 'startStream' is not called by rtmp, so workaround here
- if(rcl.publicSID != canvas.publicSID) {
- this.startStream(rcl.publicSID, rcl.broadCastID, rcl.firstname, rcl.lastname, rcl.interviewPodId);
- }
} else {
obj.deleteVideoConfProfilePic(null);
- //TODO: fixme: startStream must be called by rtmp
- // For some reason the method 'startStream' is not called by rtmp, so workaround here
- if(rcl.publicSID != canvas.publicSID) {
- this.startStream(rcl.publicSID, rcl.broadCastID, rcl.firstname, rcl.lastname, rcl.interviewPodId);
- }
obj.setAttribute("visibility","visible");
}
obj.thisVars = rcl;
obj.updateAVSettingsSymbol(rcl);
</method>
- <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId">
+ <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
<![CDATA[
- if ($debug) Debug.write("startStream publicSID: ", publicSID, ", broadcastId: ",broadcastId);
+ if ($debug) Debug.write("startStream: ", publicSID,broadcastId,firstname,lastname,interviewPodId,width,height);
var obj = this.getVideoObjectByPublicSID(publicSID);
//if ($debug) Debug.write("startStream obj: ",obj);
if (obj != null ){
@@ -354,7 +373,11 @@
}
]]>
</method>
-
+
+
+
+ <!--
+ function not in use ?! swagner 04.02.2012
<method name="videoOnMove" args="interviewPodId, x, y">
if($debug) Debug.write("videoOnY: ", interviewPodId, y);
var obj = getVideoObjectByInterviewPodId(interviewPodId);
@@ -364,6 +387,7 @@
obj.setAttribute('y', y);
}
</method>
+ -->
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx Sat Feb 4 17:01:52 2012
@@ -40,8 +40,9 @@
canvas.roomTypesInitValues = value;
</method>
- <method name="reconnectSuccess" args="connection_url">
+ <method name="reconnectSuccess" args="connection_url,publicSID">
if($debug) Debug.write("reconnectSuccess",connection_url);
+ canvas.publicSID = publicSID;
canvas.thishib.setAttribute('src',connection_url);
canvas.thishib.connect();
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/baseVideoObject.lzx Sat Feb 4 17:01:52 2012
@@ -115,31 +115,25 @@
<handler name="ony">
<![CDATA[
- if ($debug) Debug.write("ony 1 ");
if (this.isInterview) {
return;
}
- if ($debug) Debug.write("ony 2 ");
if (this.custom) {
return;
}
- if ($debug) Debug.write("ony 3 ");
- if (canvas.currentRoomObj.hideWhiteboard) {
+ if (canvas.currentRoomObject.hideWhiteboard) {
return;
}
- if ($debug) Debug.write("ony 4 ");
var bounds = this.getBounds();
var parentBounds = canvas.getBounds();
if ( bounds.y < 0 )
{
this.setAttribute('y',0);
}
- if ($debug) Debug.write("ony 5 ");
if ( bounds.y > ( parentBounds.height - bounds.height ) )
{
this.setAttribute('y', parentBounds.height - bounds.height );
}
- if ($debug) Debug.write("ony 6 ");
]]>
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/editRecordStreamSWF10.lzx Sat Feb 4 17:01:52 2012
@@ -98,7 +98,7 @@
-->
<method name="clb_getBroadCastId" args="value">
if ($debug) Debug.write("getBroadCastId",value,canvas.publicSID);
- this.myvideocontainer = canvas._videoComponent.createVideoObject(canvas.publicSID, true, -1);
+ this.myvideocontainer = canvas._videoComponent.createVideoObject(canvas.publicSID, true, -1, value);
this.myvideocontainer.setAttribute("visibility","hidden");
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectPlayBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectPlayBroadcast.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectPlayBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/videoObjectPlayBroadcast.lzx Sat Feb 4 17:01:52 2012
@@ -12,19 +12,37 @@
<attribute name="interviewPodId" value="-1" />
<attribute name="ratioW" value="1" />
<attribute name="ratioH" value="1" />
+
+ <attribute name="videoInsetX" value="2" type="number" />
+ <attribute name="videoInsetY" value="21" type="number" />
+ <attribute name="bottomBarHeight" value="0" type="number" />
+
<handler name="oninit">
<![CDATA[
if ($debug) Debug.write("Init videoObjectPlayBroadcast ",this.name);
-
//Display widget defined in mother class
- if(this.syncuser) this.syncuser.bringToFront()
this._loudness.bringToFront();
- if(this.showuser) this.showuser.bringToFront();
this._resizeview.bringToFront();
]]>
</handler>
+
+ <!---
+ Change the video resolution by chaning pod size
+ -->
+ <method name="setDefaultVideoSize" args="w,h">
+ this.setAttribute("width",w+this.videoInsetX);
+
+ if (canvas.currentRoomObject.showMicrophoneStatus) {
+ this.setAttribute("bottomBarHeight",this._innertop.height + 1);
+ }
+
+ this.setAttribute("height",h+this.videoInsetY+this.bottomBarHeight);
+ </method>
- <view name="_chatvideoinner" x="1" y="20" width="${parent.width-2}" height="${parent.height-21}" >
+ <view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
+ y="$once{ parent.videoInsetY-1 }"
+ height="${parent.height-parent.videoInsetY-parent.bottomBarHeight}"
+ width="${parent.width-parent.videoInsetX}" >
<attribute name="initH"/>
<attribute name="initW"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Sat Feb 4 17:01:52 2012
@@ -1085,8 +1085,7 @@
if (value.isScreenClient) {
return;
}
- //TODO: startStream called with invalid params. Move calling of video hib method's to swf10/.../hibRtmpConnection.lzx
- //canvas._videocontainer.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId);
+ canvas._videocontainer.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId,value.VWidth,value.VHeight);
</handler>
</netRemoteCallHib>
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=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Sat Feb 4 17:01:52 2012
@@ -666,27 +666,31 @@
]]>
</method>
-
+<!---
+@doc The function does compare the new moderator list with the old and prepares the list
+ -->
<method name="analyzeModerationList" args="newList">
<![CDATA[
canvas.newModeratorList = new Array();
canvas.removeModeratorList = new Array();
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
- canvas.currentModeratorList[i].found = false;
- }
+ if (canvas.currentModeratorList != null) {
+ for (var i=0;i<canvas.currentModeratorList.length;i++) {
+ canvas.currentModeratorList[i].found = false;
+ }
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
-
- for (var k=0;k<newList.length;k++) {
- if (newList[k].publicSID == canvas.currentModeratorList[i].publicSID) {
-
- canvas.currentModeratorList[i].found = true;
-
+ for (var i=0;i<canvas.currentModeratorList.length;i++) {
+
+ for (var k=0;k<newList.length;k++) {
+ if (newList[k].publicSID == canvas.currentModeratorList[i].publicSID) {
+
+ canvas.currentModeratorList[i].found = true;
+
+ }
}
+
}
-
}
for (var k=0;k<newList.length;k++) {
@@ -695,15 +699,17 @@
for (var k=0;k<newList.length;k++) {
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
-
- if (newList[k].publicSID == canvas.currentModeratorList[i].publicSID) {
+ if (canvas.currentModeratorList != null) {
+ for (var i=0;i<canvas.currentModeratorList.length;i++) {
- newList[k].found = true;
+ if (newList[k].publicSID == canvas.currentModeratorList[i].publicSID) {
+
+ newList[k].found = true;
+
+ }
}
-
- }
+ }
}
@@ -717,12 +723,14 @@
}
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
-
- if (!canvas.currentModeratorList[i].found) {
- canvas.removeModeratorList.push(canvas.currentModeratorList[i])
+ if (canvas.currentModeratorList != null) {
+ for (var i=0;i<canvas.currentModeratorList.length;i++) {
+
+ if (!canvas.currentModeratorList[i].found) {
+ canvas.removeModeratorList.push(canvas.currentModeratorList[i])
+ }
+
}
-
}
if ($debug) Debug.write("newModeratorList :: ",canvas.newModeratorList);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx Sat Feb 4 17:01:52 2012
@@ -20,10 +20,11 @@
-->
<library>
- <!-- new Library -->
+ <!-- new Library
<include href="baseVideoView.lzx" />
<include href="baseVideoStream.lzx" />
<include href="baseVideoStreamDevice.lzx" />
+ -->
<include href="rtmpConnection.lzx" />
<include href="sharedObject.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=1240548&r1=1240547&r2=1240548&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 4 17:01:52 2012
@@ -9,6 +9,10 @@
canvas.thishib.switchMicMuted.setMute(publicSID, tMute);
};
</handler>
+
+ <method name="reconnectSuccess">
+ canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src, canvas.publicSID);
+ </method>
<handler name="onismoderator" reference="canvas" args="m">
canvas.lc.send(canvas.vid_lc_name, "ismoderatorChanged", m);
@@ -24,20 +28,20 @@
<!--
Creates video object
-->
- <method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId">
- canvas.lc.send(canvas.vid_lc_name, "createVideo", publicSID, displayName, broadcastId, avsettings, interviewPodId);
+ <method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId,object">
+ canvas.lc.send(canvas.vid_lc_name, "createVideo", publicSID, displayName, broadcastId, avsettings, interviewPodId, object);
</method>
- <method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId">
- canvas.lc.send(canvas.vid_lc_name, "createVideoObject", publicSID, isBroadcasting, interviewPodId);
+ <method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId,object">
+ canvas.lc.send(canvas.vid_lc_name, "createVideoObject", publicSID, isBroadcasting, interviewPodId,object);
</method>
<!--
invoked whenever a User starts to Stream Video in this Room,
interviewPodId has only a meaning in the Room Type Interview
-->
- <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId">
- canvas.lc.send(canvas.vid_lc_name, "startStream", publicSID,broadcastId,firstname,lastname,interviewPodId);
+ <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,vWidth,vHeight">
+ canvas.lc.send(canvas.vid_lc_name, "startStream", publicSID,broadcastId,firstname,lastname,interviewPodId,vWidth,vHeight);
</method>
<!---
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/moderationMiniIconsEventUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/moderationMiniIconsEventUserList.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/moderationMiniIconsEventUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/moderationMiniIconsEventUserList.lzx Sat Feb 4 17:01:52 2012
@@ -104,6 +104,8 @@
}
}
+ if ($debug) Debug.write("+ STATUS ICONS + ",this.showAvIcons,canvas.isBroadCasting);
+
if (this.showAvIcons) {
if (canvas.isBroadCasting) {
this._allowDevice.setAttribute("visibility","hidden");
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx Sat Feb 4 17:01:52 2012
@@ -23,14 +23,13 @@
<include href="commonVideoComponentAdapter.lzx"/>
<include href="whiteboard/" />
-<!-- <include href="remote/" />-->
<include href="tabbar/" />
<include href="tabcontent/" />
<include href="popups/" />
<include href="moderation/" />
<include href="video/" />
<include href="polls/" />
- <include href="videoclassroom/" />
+ <!-- <include href="videoclassroom/" /> -->
<include href="conference/" />
<!-- throws an Exception
<include href="browser/"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx Sat Feb 4 17:01:52 2012
@@ -225,7 +225,7 @@
<view name="_icon_remote" x="62" y="3" resource="remote_allow_rsc" onclick="" showhandcursor="false">
<labelTooltip labelid="1084" />
</view>
-
+
<view width="1" height="${ parent.parent.height }" x="80"
bgcolor="$once{ canvas.basebgcolorizer }" />
<view name="_icon_remote" x="82" y="3" resource="participants_exclusive_audio_rsc" onclick="" showhandcursor="false">
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=1240548&r1=1240547&r2=1240548&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 4 17:01:52 2012
@@ -64,7 +64,7 @@
<method name="reconnectSuccess">
if ($debug) Debug.write("User Reloged In");
- canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src);
+ this._videoviewcontent.reconnectSuccess();
//set default values and get already availible streams
this.getRoomModeratorsByRoomId.doCall();
</method>
@@ -130,9 +130,6 @@
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("+++++++++++++++++");
if ($debug) Debug.write("+++++++++++++++++ setRoomValues1: ",roomStatus);
- //if ($debug) Debug.write("setRoomValues2: ",hib.currentroomid);
-
- //if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
if (roomStatus.roomFull) {
canvas.thishib.showFullMessage = true;
@@ -196,9 +193,6 @@
<![CDATA[
if(canvas.currentRoomObj.hideWhiteboard){
var videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
- //if (this.userNewVideoContainer) {
- // videoContainer = parent.parent._videoviewcontent;
- //}
for (var i=0;i<videoContainer.subviews.length;i++){
//if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",this._videoviewcontent.subviews[i].broadcastId);
@@ -251,30 +245,12 @@
//if ($debug) Debug.write("???????? object.isBroadcasting :: ",object.isBroadcasting);
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID);
- myvideocontainer.clientVars = object;
- myvideocontainer.setAttribute('chatpartnername',object.firstname+' '+object.lastname);
- if ($debug) Debug.write("object.avsettings: ",object.avsettings);
- if (object.avsettings=="n"){
- myvideocontainer.setVideouserProfilePic(object);
- myvideocontainer.setAttribute("visibility","hidden");
- } else if (object.avsettings=="a"){
- myvideocontainer.setVideouserProfilePic(object);
- if ($debug) Debug.warn("start play");
- myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
- myvideocontainer.setAttribute("visibility","hidden");
- } else {
- myvideocontainer.setDefaultVideoSize(object.VWidth,object.VHeight);
- myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
- myvideocontainer.setAttribute("visibility","visible");
- if ($debug) Debug.warn("start play");
- }
- myvideocontainer.updateAVSettingsSymbol(object);
+ this._videoviewcontent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1, object);
//do add others
this._participants.addItem(object);
- return myvideocontainer;
+ //return myvideocontainer;
} else {
//do add self too
@@ -284,237 +260,47 @@
]]>
</method>
-
- <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
- <![CDATA[
- if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
-
- if (canvas.publicSID != object.publicSID){
-
-
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID);
- myvideocontainer.clientVars = object;
- myvideocontainer.setAttribute('chatpartnername',object.firstname+' '+object.lastname);
- if ($debug) Debug.write("addClientItem avsettings: ",object.avsettings);
- if (object.avsettings=="n" || object.avsettings=="a"){
- myvideocontainer.setVideouserProfilePic(object);
- }
- myvideocontainer.updateAVSettingsSymbol(object);
-
- }
- //Do Add it anyway
- this._participants.addItem(object);
- ]]>
+ <method name="setSpeakingByPos" args="publicSID,bool">
+ this._videoviewcontent.setSpeakingByPos(publicSID, bool);
</method>
-
- <!--
- invoked whenever a User starts to Stream Video in this Room,
- interviewPodId has only a meaning in the Room Type Interview
- -->
- <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
- <![CDATA[
- //if ($debug) Debug.write("startStream broadcastId: ",broadcastId);
- var obj = this.getVideoObjectByPublicSID(publicSID);
- //if ($debug) Debug.write("startStream obj: ",obj);
- if (obj != null ){
- obj.setDefaultVideoSize(width,height);
- obj._chatvideoinner._videostream.playStream(broadcastId,-1);
- obj.setAttribute('chatpartnername',firstname+' '+lastname);
- }
- ]]>
+
+ <method name="closeStreamClient" args="publicSID">
+ this._videoviewcontent.closeStreamClient(publicSID);
</method>
<method name="updateMuteStatusVideoView" args="roomClient">
- <![CDATA[
- var videoContainer = parent.parent._videoviewcontent;
- for (var i=0;i<videoContainer.subviews.length;i++){
- videoContainer.subviews[i].muteMicrophone(roomClient);
- }
- ]]>
+ this._videoviewcontent.updateMuteStatusVideoView(roomClient);
</method>
- <!--
- This method returns an object of type videoObjectBroadcast
- you can only publish you a/v with this object
- @param string broadcastId broadcastId
- -->
- <method name="getNewVideoObject" args="publicSID">
- <![CDATA[
- if(canvas.currentRoomObj.hideWhiteboard){
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- this.broadCastViewRef = obj;
- } else {
-
- var videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
- if (this.userNewVideoContainer) {
- videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
- }
-
- if ($debug) Debug.warn("videoContainer ",videoContainer);
-
- //Get a Free VideoView Slot
- var freePos = videoContainer.getVideoObjectFreePos(10, 100, 100);
-
- this.broadCastViewRef = new lz.videoObjectBroadcast(videoContainer,{
- publicSID:publicSID,
- x:freePos[0],y:freePos[1],
- hidebyAudioOnly:true
- });
- canvas.currentusercolor = this.getColorForUser();
- this.broadCastViewRef._chatvideoinner.r.destroy();
- canvas.thishib.setAudienceModus.doCall();
- this.broadCastViewRef.setAttribute('chatpartnername',hib.userobject.firstname+' '+hib.userobject.lastname);
- }
- return this.broadCastViewRef;
- }else{
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- this.broadCastViewRef = obj;
- } else {
-
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- if ($debug) Debug.warn("videoContainer ",videoContainer);
-
- //Get a Free VideoView Slot
- var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
-
- this.broadCastViewRef = new lz.videoObjectBroadcast(videoContainer,{
- publicSID:publicSID,
- x:freePos[0],y:freePos[1],
- hidebyAudioOnly:true
- });
- canvas.currentusercolor = this.getColorForUser();
- this.broadCastViewRef._chatvideoinner.r.destroy();
- canvas.thishib.setAudienceModus.doCall();
- this.broadCastViewRef.setAttribute('chatpartnername',hib.userobject.firstname+' '+hib.userobject.lastname);
- }
- return this.broadCastViewRef;
- }
- ]]>
+ <method name="disconnectclient" args="publicSID">
+ this._videoviewcontent.disconnectclient(publicSID);
+ this._participants.disconnectclient(publicSID);
</method>
-
- <!---
- returns a new object of type videoObjectPlayBroadcast
- you can only play a stream not publish you a/v with this object
- @param string broadcastId broadcastId
- -->
- <method name="getNewVideoObjectByPos" args="publicSID">
- <![CDATA[
- if(canvas.currentRoomObj.hideWhiteboard){
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- return obj;
- }
- var videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
- if (this.userNewVideoContainer) {
- videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
- }
-
- //Get a Free VideoView Slot
- var freePos = videoContainer.getVideoObjectFreePos(10, 100, 100);
-
- return new lz.videoObjectPlayBroadcast(videoContainer,{
- publicSID:publicSID,
- x:freePos[0],y:freePos[1]
- });
- }else{
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- return obj;
- }
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- //Get a Free VideoView Slot
- var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
-
- return new lz.videoObjectPlayBroadcast(videoContainer,{
- publicSID:publicSID,
- x:freePos[0],y:freePos[1]
- });
- }
- ]]>
+
+ <method name="resetAllValues">
+ this._videoviewcontent.resetAllValues();
</method>
- <!---
- invoked remotely by Red5-notification
- shows a green light if somebody is speaking
- @param string broadcastId broadcastId
- @param boolean bool show light on/off
- -->
- <method name="setSpeakingByPos" args="publicSID,bool">
- <![CDATA[
- var obj = this.getVideoObjectByPublicSID(publicSID);
- var objList = this._participants.getVideoObjectByPublicSID(publicSID);
- if (bool){
- obj._loudness.loudness.setAttribute('opacity',1);
- objList._miniIcons._loudness.loudness.setAttribute('opacity',1);
- } else {
- obj._loudness.loudness.setAttribute('opacity',0.2);
- objList._miniIcons._loudness.loudness.setAttribute('opacity',0.2);
- }
- ]]>
- </method>
-
- <!---
- stops the streaming but does not destroy the view
- @param int broadcastId broadcastId
+ <!--
+ invoked whenever a User starts to Stream Video in this Room,
+ interviewPodId has only a meaning in the Room Type Interview
-->
- <method name="closeStreamClient" args="publicSID">
- <![CDATA[
- if ($debug) Debug.write("closeStreamclient: ",publicSID);
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if ($debug) Debug.write("closeStreamclient obj: ",obj);
- if (obj != null){
- obj.resetValues();
- }
- ]]>
+ <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight">
+ this._videoviewcontent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight);
</method>
- <!---
- stops the streaming but and destroys the view
- @param int broadcastId broadcastId
- -->
- <method name="disconnectclient" args="publicSID">
+ <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
<![CDATA[
- if ($debug) Debug.write("disconnectclient: ",publicSID);
-
- var obj = this.getVideoObjectByPublicSID(publicSID);
- var objList = this._participants.getVideoObjectByPublicSID(publicSID);
-
- //if ($debug) Debug.write("disconnectclient obj: ",obj);
- if (obj == null) {
- if ($debug) Debug.warn("Could Not find CLient To disconnect",publicSID);
- }
-
- if (obj != null){
- obj.resetValues();
- obj.destroy();
- }
- if (objList != null){
- objList.resetValues();
- objList.destroy();
- }
- return null;
- ]]>
- </method>
-
- <method name="resetAllValues">
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
- for (var eg in videoContainer.subviews){
- videoContainer.subviews[eg].resetValues();
+ 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);
}
+
+ //Do Add it anyway
+ this._participants.addItem(object);
+ ]]>
</method>
<moderationMiniIconsEventUserList name="_applyAndStatusIcons" showAvIcons="false" x="2" y="2" >
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx Sat Feb 4 17:01:52 2012
@@ -82,6 +82,8 @@
if ($debug) Debug.write("parent.setUserAVSettings -1- ",parent.chosenSetting);
if ($debug) Debug.write("parent.setUserAVSettings -2- ",parent.remoteMessage);
+ if ($debug) Debug.write("parent.setUserAVSettings -3- ",parent.chosenSetting);
+ if ($debug) Debug.write("parent.setUserAVSettings -4- ",parent.remoteMessage);
parent.setUserAVSettings.doCall();
]]>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/library.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/library.lzx Sat Feb 4 17:01:52 2012
@@ -43,15 +43,19 @@
<resource name="unmute_btn_rsc" src="resources/micro_off.png" />
<resource name="lz_recorder_play" src="resources/webstart_play.png" />
+
+ <include href="editRecordStream.lzx" />
+ <!--
<include href="videoUserProfilePic.lzx" />
<include href="remoteUserDetails.lzx" />
- <include href="editRecordStream.lzx" />
+
<include href="baseVideoObject.lzx" />
<include href="videoObjectBroadcast.lzx" />
<include href="videoObjectPlayBroadcast.lzx" />
<include href="videoObjectTestBroadcast.lzx" />
<include href="videoObjectPlayTestBroadcast.lzx" />
+ -->
<!--
<include href="videoContainer.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx?rev=1240548&r1=1240547&r2=1240548&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx Sat Feb 4 17:01:52 2012
@@ -72,8 +72,7 @@
this.initW = this.width;
</handler>
- <view name="r" resource="chatbgitem" width="${parent.width}"
- height="${parent.height}" stretches="both" />
+ <view name="r"></view>
<baseVideoStream name="_videostream" bgcolor="black"
width="${parent.width}" height="${parent.height}" />