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/22 20:13:20 UTC
svn commit: r1292451 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent:
src/modules/conference/ src/modules/conference/flexibleConferenceRoom/
swf10/ swf10/screensharing/ swf10/screensharing/resources/
Author: sebawagner
Date: Wed Feb 22 19:13:19 2012
New Revision: 1292451
URL: http://svn.apache.org/viewvc?rev=1292451&view=rev
Log:
OPENMEETINGS-61 Make exit clean up all screen sharing playback videos, whiteboard playback videos, user videos and disconnect SWF10 container, fix some reference errors
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/menupointer.png (with props)
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1292451&r1=1292450&r2=1292451&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Wed Feb 22 19:13:19 2012
@@ -65,10 +65,9 @@
<handler name="ontabcontentleave">
if ($debug) Debug.write("################# ontabcontentleave:",this);
+ //close all screensharings, videos and closes the rtmp connection in the remote host
this._screenSharingAdapter.closeAllScreenSharings();
- canvas.currentBaseConferenceRoom = null;
-
//reset the right to draw on WHiteboard as the RoomClient Object will be destroyed also
//on server-Side the canDraw status will be false again when you relogin the same room
canvas.isAllowedToDraw = true;
@@ -107,6 +106,8 @@
this.logicalRoomLeave.doCall();
if ($debug) Debug.write("############ this.logicalRoomLeave ",this.logicalRoomLeave);
</handler>
+
+
<netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave" remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
@@ -114,6 +115,7 @@
//this.parent.destroy();
canvas.thishib.reconnectAfterRoomleft = true;
canvas.thishib.reconnectedRoomInstance = this.parent;
+ canvas.currentBaseConferenceRoom = null;
// Reconnect User to default Scope
canvas.thishib.userScope = "hibernate";
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx?rev=1292451&r1=1292450&r2=1292451&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx Wed Feb 22 19:13:19 2012
@@ -58,6 +58,7 @@
-->
<method name="closeAllScreenSharings" >
//Send via LocalConnection to SWF10 container
+ if ($debug) Debug.write("closeAllScreenSharings SEND");
canvas.lc.send(canvas.rtmp_lc_name, "closeAllScreenSharings");
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1292451&r1=1292450&r2=1292451&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Wed Feb 22 19:13:19 2012
@@ -36,7 +36,6 @@
client.setSpeakingByPos = this.setSpeakingByPos;
client.setAVSettingsToClient = this.setAVSettingsToClient;
client.startStream = this.startStream;
- client.clearAll = this.clearAll;
client.removeVideoByUser = this.removeVideoByUser;
client.muteSound = this.muteSound;
// client.videoOnMove = this.videoOnMove; function not in use ?! swagner 04.02.2012
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1292451&r1=1292450&r2=1292451&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx Wed Feb 22 19:13:19 2012
@@ -211,7 +211,7 @@
this[tName].destroy();
}
- new lz.playBackWhiteboardVideo(this,{
+ new lz.playBackWhiteboardVideo(this.whiteboardVideos,{
name:tName,
x:tx,
y:ty,
@@ -226,9 +226,9 @@
<method name="stopWhiteboardVideo" args="tName">
<![CDATA[
if($debug) Debug.write("stopWhiteboardVideo ",tName);
- if (this[tName]) {
- this[tName].stopVideo();
- this[tName].destroy();
+ if (this.whiteboardVideos[tName]) {
+ this.whiteboardVideos[tName].stopVideo();
+ this.whiteboardVideos[tName].destroy();
} else {
if ($debug) Debug.warn("stopWhiteboardVideo could not find video to stop");
}
@@ -286,16 +286,20 @@
</method>
<!---
- Closes all single screen sharing playback videos
+ Closes all screen sharing playback videos, whiteboard videos, user videos
+ and closes the rtmp connection
-->
- <method name="closeAllScreenSharings" args="value">
+ <method name="closeAllScreenSharings">
<![CDATA[
- if ($debug) Debug.write("closeAllScreenSharings ",value);
+ if ($debug) Debug.write("RECEIVE closeAllScreenSharings ");
if (canvas.screenSharingDialogContainer != null) {
canvas.screenSharingDialogContainer.closeAll();
canvas.screenSharingDialogContainer.destroy();
canvas.screenSharingDialogContainer = null;
}
+ this.whiteboardVideos.clearAll();
+ parent._videoComponent.clearAll();
+ canvas.thishib.disconnect();
]]>
</method>
@@ -311,6 +315,20 @@
}
]]>
</method>
+
+ <!--
+ Container to hold all whiteboard videos
+ -->
+ <view name="whiteboardVideos">
+ <method name="clearAll">
+ <![CDATA[
+ for (var eg in this.subviews) {
+ this.subviews[eg].stopVideo();
+ this.subviews[eg].destroy();
+ }
+ ]]>
+ </method>
+ </view>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx?rev=1292451&r1=1292450&r2=1292451&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx Wed Feb 22 19:13:19 2012
@@ -20,6 +20,7 @@
-->
<library>
+ <resource name="menupointer_rsc" src="resources/menupointer.png" />
<include href="screenSharingDialog.lzx" />
<include href="videoObjectPlayScreenShare.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/menupointer.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/menupointer.png?rev=1292451&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/resources/menupointer.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx?rev=1292451&r1=1292450&r2=1292451&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx Wed Feb 22 19:13:19 2012
@@ -925,7 +925,7 @@
<![CDATA[
this.bringToFront();
var t:SharedObject = SharedObject.getLocal('userdata');
- var g = g.data;
+ var g = t.data;
if (g["image"]!=null) {
if ($debug) Debug.write("g[image][donotaskagainrdc] ",g["image"]["donotaskagainrdc"]);
if ($debug) Debug.write("g[image] ",g["image"]);
@@ -962,7 +962,7 @@
<handler name="oninit">
<![CDATA[
var t:SharedObject = SharedObject.getLocal('userdata');
- var g = g.data;
+ var g = t.data;
if (g["image"]!=null) {
if ($debug) Debug.write("g[image]",g["image"]);
if (g["image"]["donotaskagainrdc"] != null && g["image"]["donotaskagainrdc"] == true) {
@@ -979,7 +979,7 @@
}
if ($debug) Debug.write("onselect ",v);
var t:SharedObject = SharedObject.getLocal('userdata');
- var g = g.data;
+ var g = t.data;
if (g["image"]==null) g["image"]=new Array();
g["image"]["donotaskagainrdc"]=v;