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/25 11:40:07 UTC
svn commit: r1293573 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: src/base/hibernate/
src/base/remote/ src/modules/conference/
src/modules/conference/interviewuserlist/
src/modules/conference/participants/ src/modules/conference/popups/ ...
Author: sebawagner
Date: Sat Feb 25 10:40:06 2012
New Revision: 1293573
URL: http://svn.apache.org/viewvc?rev=1293573&view=rev
Log:
OPENMEETINGS-71 replace basic notifications to new audio/video components
OPENMEETINGS-44 delete audio/video components from SWF8
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/1downarrow.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/1downarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/bgitemvideochat.swf
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/bgitemvideochat.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/error.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/error.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/icon_mute.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/icon_mute.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/icon_mute_red.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/icon_mute_red.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/messagebox_warning.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/messagebox_warning.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/micro_off.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/micro_off.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/micro_on.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/micro_on.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/noatunloopsong.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/noatunloopsong.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/speaking.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/speaking.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/webstart_play.png
- copied unchanged from r1293381, incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/webstart_play.png
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/baseVideoStreamDevice.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/baseVideoView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/background/
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/icons/
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/list_background_1.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/list_background_1_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/list_background_1_play.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/list_background_2.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/play_dn.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/play_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/play_up.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/recorder_dn.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/recorder_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/recorder_up.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/stop_dn.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/stop_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/resources/stop_up.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
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/interviewuserlist/interviewVideoBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/loginScreen.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
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=1293573&r1=1293572&r2=1293573&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 25 10:40:06 2012
@@ -976,7 +976,7 @@
if (canvas.ismoderator){
if (this.parent.modus == "conference"){
if ($debug) Debug.write("############## showDevicePopUp 3");
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false,false);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
}
} else if (value==null){
//I think we never can run into this! value is always != null, this is from a previous implementation
@@ -985,7 +985,7 @@
//check if this is conferenceViewmodus
if (this.parent.modus == "conference"){
if ($debug) Debug.write("############## showDevicePopUp 4");
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false,false);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
} else {
// in audienceView modus you get no notification
// cause you are not able to register your stream
@@ -994,7 +994,7 @@
} else {
if (this.parent.modus == "conference"){
if ($debug) Debug.write("############## showDevicePopUp 1a");
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false,false);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
}
}
canvas._drawarea.onopenWhiteBoard.sendEvent();
@@ -1269,7 +1269,7 @@
if (canvas.thishib.modus == "interview") {
canvas._drawarea.newInterviewStarting(value);
} else {
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false,false);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
}
canvas.setAttribute("isBroadCasting",true);
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=1293573&r1=1293572&r2=1293573&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 10:40:06 2012
@@ -2,6 +2,7 @@
<library>
<class name="commonVideoComponentAdapter" extends="node">
+
<handler name="oninit">
var t = this;
@@ -15,12 +16,25 @@
</handler>
<!---
- Show the popup with the possibility to choose the device settings
- @param isSyncUpdate show the popup also if the user has clicked the "do not show again" chceckbox
- @param isInterview
+ Show the popup with the possibility to choose the device settings
+ @param isSyncUpdate show the popup also if the user has clicked the "do not show again" chceckbox
+ @param interviewPodId the view id
+ @param tx x-position
+ @param ty y-position
+ @param twidth width-position
+ @param theight height-position
-->
- <method name="showDevicePopUp" args="isSyncUpdate,isInterview">
- canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream", isSyncUpdate, isInterview);
+ <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);
+ </method>
+
+ <!---
+ Show the popup with the possibility to choose the device settings
+ @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);
</method>
<!---
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=1293573&r1=1293572&r2=1293573&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 10:40:06 2012
@@ -55,15 +55,28 @@
//The user is already in the correct Scope
this.reconnectSuccess();
}
-
- _videoviewcontent.initVideoContainer(40, 281, 281);
</handler>
<method name="reconnectSuccess">
if ($debug) Debug.warn("User Reloged In ",canvas.becomemoderator);
- canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src);
+ //Send to SWF10 video-container to connect on the conference room url
+ //and wait for the as3ConnectionSuccess-Event
+ this._videoviewcontent.reconnectSuccess();
+ </method>
+
+ <!---
+ We need to wait till the video-container / as3 app has the connection established
+ otherwise it can happen that the video tries to start playing before the rtmp-connection
+ was established
+ -->
+ <method name="as3ConnectionSuccess">
+ if ($debug) Debug.write("as3ConnectionSuccess continue loading");
//set default values and get already availible streams
- this.getRoomModeratorsByRoomId.doCall();
+ //it can happen that if you click to exit the room the views are not
+ //not cleaned up yet and you receive this event from the LocalConnection
+ if (this["getRoomModeratorsByRoomId"]) {
+ this.getRoomModeratorsByRoomId.doCall();
+ }
</method>
<netRemoteCallHib name="getRoomModeratorsByRoomId" funcname="conferenceservice.getRoomModeratorsByRoomId"
@@ -161,315 +174,76 @@
<!-- invoked if another client logs into the room
after choosing devices -->
<method name="setAVSettingsToClient" args="rcl">
- if ($debug) Debug.write("setAVSettingsToClient ",rcl.publicSID,rcl);
-
- if (canvas.publicSID == rcl.publicSID) {
- //we do not throw this event back to the same user again!
- return;
- }
-
- var obj = this.getVideoObjectByPublicSID(rcl.publicSID);
-
- if (obj == null) {
- obj = this.getNewVideoObjectByPos(rcl.publicSID,rcl.interviewPodId);
- }
-
- if ($debug) Debug.write("setAVSettingsToClient: ",obj,rcl.avsettings);
- if (rcl.avsettings=="n"){
- obj.setAttribute("visibility","hidden");
- obj.setVideouserProfilePic(rcl);
- } else if (rcl.avsettings=="a"){
- obj.setVideouserProfilePic(rcl);
- obj.setAttribute("visibility","visible");
- if(rcl.publicSID != canvas.publicSID) {
- this.startStream(rcl.publicSID, rcl.broadCastID, rcl.firstname, rcl.lastname, rcl.interviewPodId);
- }
- } else {
- obj.deleteVideoConfProfilePic();
- obj.setAttribute("visibility","visible");
- if(rcl.publicSID != canvas.publicSID) {
- this.startStream(rcl.publicSID, rcl.broadCastID, rcl.firstname, rcl.lastname, rcl.interviewPodId);
- }
- }
- obj.clientVars = rcl;
- obj.updateAVSettingsSymbol(rcl);
+ this._videoviewcontent.setAVSettingsToClient(rcl);
</method>
-
- <!--- get a baseVideoObject by a Users publicSID
- @param string publicSID publicSID
- -->
- <method name="getVideoObjectByPublicSID" args="publicSID">
- <![CDATA[
- //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
-
- var videoContainer = canvas._drawarea._videoviewcontent;
-
- for (var i=0;i<videoContainer.subviews.length;i++){
- //if ($debug) Debug.write("getVideoObjectByPublicSID: videoContainer.subviews[i]._videoPlay",videoContainer.subviews[i]._videoPlay);
- if (videoContainer.subviews[i]._videoPlay.publicSID == publicSID){
- return videoContainer.subviews[i]._videoPlay;
- }
- }
-
- if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
-
- return null;
-
- ]]>
- </method>
-
<method name="addItem" args="connectedSince,isMod,streamid,username,userroom,formatedDate,position,color,object">
<![CDATA[
- if ($debug) Debug.write("addItem :: ",object);
- //if ($debug) Debug.write("initializeStreams addItem: ",connectedSince,isMod,streamid,username,formatedDate);
+ if ($debug) Debug.write("initializeStreams addItem: ",connectedSince,object);
//Do init only in case this stream is NOT the same as we are
if (streamid!=canvas.streamid){
-
- //do add others
- this._participents.addItem(object);
-
- if ($debug) Debug.write("???????? object.isBroadcasting :: ",object.isBroadcasting,object.interviewPodId);
-
- if (object.isBroadcasting) {
-
- if ($debug) Debug.write("###### object.isBroadcasting ########");
-
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID,object.interviewPodId);
- 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","visible");
- } else {
- myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
- myvideocontainer.setAttribute("visibility","visible");
- if ($debug) Debug.warn("start play");
- }
- myvideocontainer.updateAVSettingsSymbol(object);
- return myvideocontainer;
-
- } else {
- return null;
- }
-
- } else {
-
- //do add self too
- this._participents.addItem(object);
-
- return null;
+ //if ($debug) Debug.write("???????? object.isBroadcasting :: ",object.isBroadcasting);
+ this._videoviewcontent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1, object);
}
+ //do add self too
+ this._participants.addItem(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){
-
- if (object.isBroadcasting) {
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID,object.interviewPodId);
- 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._participents.addItem(object);
+ if (canvas.publicSID != object.publicSID){
+ this._videoviewcontent.createVideoObject(object.publicSID, false, -1, object);
+ }
+
+ //Do Add it anyway
+ this._participants.addItem(object);
]]>
</method>
<!--
- invoked whenever a User starts to Stream Video in this Room
- -->
- <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId">
- <![CDATA[
- if ($debug) Debug.warn("startStream broadcastId: ",publicSID,broadcastId,firstname,lastname,interviewPodId);
-
- if (canvas.publicSID == publicSID) {
- if ($debug) Debug.warn("startStream Event should never be thrown back to its sender");
- return;
- }
-
- var obj = this.getVideoObjectByPublicSID(publicSID);
-
- if (obj == null) {
- obj = this.getNewVideoObjectByPos(publicSID,interviewPodId);
- }
-
- if ($debug) Debug.write("startStream obj: ",obj);
-
- if (obj != null ){
- obj._chatvideoinner._videostream.playStream(broadcastId,-1);
- obj.setAttribute('chatpartnername',firstname+' '+lastname);
- } else {
- if ($debug) Debug.warn("Could Not find the correct obj to startStream - This should not happen logically",publicSID);
- }
- ]]>
+ 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,VWidth,VHeight">
+ this._videoviewcontent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight);
</method>
<method name="updateMuteStatusVideoView" args="roomClient">
- <![CDATA[
- this._videoviewcontent.updateMuteStatusVideoView(roomClient);
- var videoContainer = canvas._drawarea._videoviewcontent;
- for (var i=0;i<videoContainer.subviews.length;i++){
- videoContainer.subviews[i]._videoPlay.muteMicrophone(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[
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- this.broadCastViewRef = obj;
- } else {
-
- if ($debug) Debug.error("getNewVideoObject :: ",publicSID);
- if ($debug) Debug.error("getNewVideoObject :: ",publicSID);
- if ($debug) Debug.error("getNewVideoObject :: ",publicSID);
- if ($debug) Debug.error("getNewVideoObject :: ",publicSID);
- if ($debug) Debug.error("getNewVideoObject :: ",publicSID);
-
- }
- return this.broadCastViewRef;
- ]]>
+ this._videoviewcontent.updateMuteStatusVideoView(roomClient);
</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,interviewPodId">
- <![CDATA[
-
- if ($debug) Debug.write("getNewVideoObjectByPos :: ",publicSID,interviewPodId);
-
- var obj = this.getVideoObjectByPublicSID(publicSID);
-
- if ($debug) Debug.write("FOUND :: ",obj);
-
- if (obj!=null){
- return obj;
- }
-
- var videoContainer = canvas._drawarea._videoviewcontent;
-
- for (var i=0;i<videoContainer.subviews.length;i++) {
-
- if (videoContainer.subviews[i].interviewPodId == interviewPodId) {
- videoContainer.subviews[i]._videoPlay.publicSID = publicSID;
- if ($debug) Debug.write("videoContainer.subviews[i] ",videoContainer.subviews[i]);
- videoContainer.subviews[i]._videoPlay.setAttribute("visibility","visible");
- return videoContainer.subviews[i]._videoPlay;
- }
-
- }
-
- if ($debug) Debug.error("Interview Room Error :: Could not find right Interview Pod [interviewPodId,publicSID] ",interviewPodId,publicSID);
-
- return null;
- ]]>
- </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[
- if ($debug) Debug.write("setSpeakingByPos :: ",publicSID,bool,obj);
-
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (bool){
- obj._loudness.loudness.setAttribute('opacity',1);
- } else {
- obj._loudness.loudness.setAttribute('opacity',0.2);
- }
- ]]>
- </method>
+ this._videoviewcontent.setSpeakingByPos(publicSID, bool);
+ </method>
<!---
stops the streaming but does not destroy the view
@param int broadcastId broadcastId
-->
<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();
- }
- return obj;
- ]]>
+ this._videoviewcontent.closeStreamClient(publicSID);
</method>
<method name="removeVideoByUser" args="userObject">
- var obj = this.closeStreamClient(userObject.publicSID);
- obj.destroy();
+ if ($edebug) Debug.write("removeVideoByUser ",userObject);
+ this.closeStreamClient(userObject.publicSID);
</method>
- <!---
- stops the streaming but and destroys the view
- @param int broadcastId broadcastId
- -->
<method name="disconnectclient" args="publicSID">
- <![CDATA[
- //if ($debug) Debug.write("disconnectclient: ",publicSID);
-
- var obj = this.getVideoObjectByPublicSID(publicSID);
- var objList = this._participents.getVideoObjectByPublicSID(publicSID);
-
- //if ($debug) Debug.write("disconnectclient obj: ",obj);
-
- if (obj != null){
- if ($debug) Debug.write("disconnectclient obj: ",obj);
- obj.resetValues();
- //We will only hide this here cause we will need it again!
- obj.setAttribute("visibility","hidden");
- }
- if (objList != null){
- if ($debug) Debug.write("disconnectclient objList: ",objList);
- objList.resetValues();
- objList.destroy();
- }
- return null;
- ]]>
- </method>
+ this._videoviewcontent.disconnectclient(publicSID);
+ this._participants.disconnectclient(publicSID);
+ </method>
<method name="resetAllValues">
- var videoContainer = canvas._drawarea._videoviewcontent;
- for (var eg in videoContainer.subviews){
- videoContainer.subviews[eg].resetValues();
- }
+ this._videoviewcontent.resetAllValues();
</method>
- <interviewListInner name="_participents" />
+ <interviewListInner name="_participants" />
<commonVideoComponentAdapter name="_videoviewcontent"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx?rev=1293573&r1=1293572&r2=1293573&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx Sat Feb 25 10:40:06 2012
@@ -81,17 +81,9 @@
<method name="startInterView">
if ($debug) Debug.write("startInterView :: ");
- //canvas._videocontainer._videoviewcontent.createVideoObject(canvas.publicSID, true, this.interviewPodId);
- var t = this;
- canvas.videoComp_lc.onStartBroadcast = function(broadCastID, settings) {
- //TODO: settings
- if ($debug) Debug.write("onStartBroadcast :: ", broadCastID, settings);
- t._videoPlay.setAttribute('chatpartnername',canvas.firstName+' '+canvas.lastName);
- t._videoPlay._chatvideoinner._videostream.playStream(broadCastID, -1);
- t._videoPlay.setAttribute("visibility","visible");
- t._videoPlay.setAttribute("publicSID", canvas.publicSID);
- };
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false,true);
+ var tx = this.getAttributeRelative("x",canvas);
+ var ty = this.getAttributeRelative("y",canvas);
+ canvas._videocontainer._videoviewcontent.showDevicePopUpInterview(false,this.interviewPodId,tx,ty,this.width,this.height);
</method>
<method name="sendConfirmation" args="publicSID">
@@ -142,10 +134,10 @@
</handler>
</simpleLabelButton>
-
+ <!--
<videoObjectPlayBroadcast name="_videoPlay" isInterview="true" visibility="hidden"
width="$once{ parent.width }" height="$once{ parent.height }" />
-
+ -->
</class>
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=1293573&r1=1293572&r2=1293573&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 25 10:40:06 2012
@@ -19,6 +19,30 @@
-->
<library>
+
+ <resource name="warning_icon_popup_devices_rsc" src="resources/messagebox_warning.png" />
+
+ <resource name="chatbgitem" src="resources/bgitemvideochat.swf" />
+
+ <resource name="showusercontextclose" src="resources/error.png" />
+ <resource name="showusercontext" src="resources/1downarrow.png" />
+ <resource name="resyncuser_rsc" src="resources/noatunloopsong.png" />
+
+ <resource name="speaking" src="resources/speaking.png" />
+ <resource name="mute_btn_rsc">
+ <frame src="resources/icon_mute.png" />
+ <frame src="resources/icon_mute_red.png" />
+ </resource>
+ <resource name="mute_micro_btn_rsc">
+ <frame src="resources/micro_on.png" />
+ <frame src="resources/micro_off.png" />
+ </resource>
+
+ <resource name="mute_btn_rsc" src="resources/micro_on.png" />
+ <resource name="unmute_btn_rsc" src="resources/micro_off.png" />
+
+ <resource name="lz_recorder_play" src="resources/webstart_play.png" />
+
<include href="commonVideoViewContent.lzx"/>
<include href="commonVideoComponentAdapter.lzx"/>
<include href="screenSharingAdapter.lzx" />
@@ -28,7 +52,9 @@
<include href="tabcontent/" />
<include href="popups/" />
<include href="moderation/" />
- <include href="video/" />
+ <!--
+ <include href="video/" />
+ -->
<include href="polls/" />
<include href="conference/" />
<!-- throws an Exception
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1293573&r1=1293572&r2=1293573&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx Sat Feb 25 10:40:06 2012
@@ -615,7 +615,7 @@
<handler name="onclick">
//TODO: local connection call
if ($debug) Debug.write("parent.parent.refObj.publicSID: ",parent.parent.refObj.publicSID);
- canvas._videocontainer._videoviewcontent.showDevicePopUp(true,false);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(true);
</handler>
<labelTooltip labelid="610" />
</miniIcons>
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=1293573&r1=1293572&r2=1293573&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 10:40:06 2012
@@ -199,22 +199,12 @@
//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);
-
- //do add others
- this._participants.addItem(object);
-
- //return myvideocontainer;
- } else {
-
- //do add self too
- this._participants.addItem(object);
-
}
+ //do add self too
+ this._participants.addItem(object);
]]>
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/loginScreen.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/loginScreen.lzx?rev=1293573&r1=1293572&r2=1293573&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/loginScreen.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/loginScreen.lzx Sat Feb 25 10:40:06 2012
@@ -103,7 +103,7 @@ There is no login any more
canvas._hideit.setAttribute('visible',false);
canvas._videocontainer.initializeStreams();
if(!canvas.isConference) {
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false,false);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
}
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx?rev=1293573&r1=1293572&r2=1293573&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx Sat Feb 25 10:40:06 2012
@@ -263,7 +263,7 @@
//check if this is conferenceView or audienceView modus
if (canvas.thishib.modus == "conference"){
if ($debug) Debug.write("############## showDevicePopUp 1 xyz");
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false,false);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
} else if(canvas.thishib.modus == "audience"){
//check in audince modus if this user is the current moderator
//this users cannot be the moderator cause he has downloaded
@@ -505,7 +505,7 @@
//check if this is conferenceView or audienceView modus
if (canvas.thishib.modus == "conference"){
if ($debug) Debug.write("############## showDevicePopUp 2 xyz");
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false,false);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
} else if(canvas.thishib.modus == "audience"){
//check in audince modus if this user is the current moderator
//this users cannot be the moderator cause he has downloaded
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1293573&r1=1293572&r2=1293573&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Sat Feb 25 10:40:06 2012
@@ -23,8 +23,8 @@
client.t = this;
//client.reconnect = this.reconnect;
- client.initVideoContainer = this.initVideoContainer;
client.createEditRecordStream = this.createEditRecordStream;
+ client.initVideoContainer = this.initVideoContainer;
client.createVideoObject = this.createVideoObject;
client.createVideo = this.createVideo;
client.getVideoObjectByPublicSID = this.getVideoObjectByPublicSID;
@@ -65,14 +65,16 @@
this.setAttribute("videoHeight",videoHeight);
</method>
- <method name="createEditRecordStream" args="syncUpdate,isInterview">
- if($debug) Debug.info("createEditRecordStream,",syncUpdate,isInterview);
+ <method name="createEditRecordStream" args="syncUpdate,isInterview,interviewPodId,tx,ty,twidth,theight">
+ if($debug) Debug.info("createEditRecordStream,",syncUpdate,isInterview,interviewPodId,tx,ty,twidth,theight);
if (canvas.inner.editRecordStream != null)
canvas.inner.editRecordStream.destroy();
new lz.editRecordStreamSWF10(canvas.inner, {
- name : "editRecordStream",
- isSyncUpdate : syncUpdate,
- isInterview : isInterview
+ name:"editRecordStream",
+ isSyncUpdate:syncUpdate,
+ isInterview:isInterview,
+ tx:tx,
+ ty:ty
});
</method>
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=1293573&r1=1293572&r2=1293573&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx Sat Feb 25 10:40:06 2012
@@ -45,6 +45,15 @@
<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" />
@@ -79,11 +88,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) {
+ if (this.doDefaultAnimation && !this.isInterview) {
this._chooseDeviceAnimation.doStart();
}
}
}
+
+ if (this.isInterview) {
+ this.setAttribute("x",tx);
+ this.setAttribute("y",ty);
+ }
]]>
</handler>
@@ -438,15 +452,18 @@
fontsize="11" x="10" y="180" visibility="hidden" />
<labelText name="availibleResolutionsLabel" labelid="1429"
- fontsize="11" x="10" y="164" width="$once{ parent.width-20 }" />
+ fontsize="11" x="10" y="164" width="$once{ parent.width-20 }"
+ visibility="${ (!parent.isInterview) ? 'visible' : 'hidden' }" />
<view name="availibleResolutionsWarning" x="272" y="164"
- resource="warning_icon_popup_devices_rsc" clickable="true" >
+ resource="warning_icon_popup_devices_rsc" clickable="true"
+ visibility="${ (!parent.isInterview) ? 'visible' : 'hidden' }">
<labelTooltip multiline="true" labelid="1430" />
</view>
<resetCombobox fontsize="11" name="availibleResolutions" x="10" shownitems="10"
- y="184" width="280" editable="false" >
+ y="184" width="280" editable="false"
+ visibility="${ (!parent.isInterview) ? 'visible' : 'hidden' }">
<!--- @keywords private -->
<attribute name="counter" value="0" />
<handler name="onselect" args="item">