Author: solomax
Date: Wed Aug 3 07:59:42 2016
New Revision: 1755040
URL: http://svn.apache.org/viewvc?rev=1755040&view=rev
Log:
[OPENMEETINGS-1442] screen-sharing is removed from the room on client exit
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1755040&r1=1755039&r2=1755040&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Wed Aug 3 07:59:42 2016
@@ -185,6 +185,7 @@
client.newMessageByRoomAndDomain =
this.newMessageByRoomAndDomain;
client.interviewStatus = this.interviewStatus;
client.newStream = this.newStream;
+ client.closeStream = this.closeStream;
//TODO FIXME method is absent :( client.stopStream =
this.stopStream;
//TODO FIXME method is absent :( sendImagesSyncCompleteFlag
client.receiveExclusiveAudioFlag =
this.receiveExclusiveAudioFlag;
@@ -734,25 +735,23 @@
canvas.commonVideoViewContent.startStream(value);
</method>
- <netRemoteCallHib name="closeStream" funcname="closeStream">
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("**** closeStream:
",value);
- if (value == null) {
- return;
- }
- if (value.screenClient) {
- if ($debug) Debug.write(" ondata
closeStream: ",value.streamPublishName);
-
canvas.commonVideoViewContent.closeScreenSharing(value);
- } else {
- //free the VideoContainer
-
//canvas._videocontainer.closeStreamClient(value.publicSID);
-
canvas.commonVideoViewContent.closeStreamClient(value.publicSID);
-
canvas.setAttribute('numberofpartners',canvas.numberofpartners-1);
- }
- //TODO:check first current tab
- </handler>
- </netRemoteCallHib>
+ <method name="closeStream" args="value">
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("**** closeStream: ",value);
+ if (value == null) {
+ return;
+ }
+ if (value.screenClient) {
+ if ($debug) Debug.write(" ondata closeStream:
",value.streamPublishName);
+
canvas.commonVideoViewContent.closeScreenSharing(value);
+ } else {
+ //free the VideoContainer
+
//canvas._videocontainer.closeStreamClient(value.publicSID);
+
canvas.commonVideoViewContent.closeStreamClient(value.publicSID);
+
canvas.setAttribute('numberofpartners',canvas.numberofpartners-1);
+ }
+ //TODO:check first current tab
+ </method>
<!---
Event is invoked if a red5 stream sharing is closed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1755040&r1=1755039&r2=1755040&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Wed Aug 3 07:59:42 2016
@@ -182,6 +182,7 @@
client.newMessageByRoomAndDomain =
this.newMessageByRoomAndDomain;
client.interviewStatus = this.interviewStatus;
client.newStream = this.newStream;
+ client.closeStream = this.closeStream;
//TODO FIXME method is absent :( client.stopStream =
this.stopStream;
//TODO FIXME method is absent :( sendImagesSyncCompleteFlag
client.receiveExclusiveAudioFlag =
this.receiveExclusiveAudioFlag;
@@ -707,25 +708,23 @@
canvas.commonVideoViewContent.startStream(value);
</method>
- <netRemoteCallHib name="closeStream" funcname="closeStream">
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("**** closeStream:
",value);
- if (value == null) {
- return;
- }
- if (value.screenClient) {
- if ($debug) Debug.write(" ondata
closeStream: ",value.streamPublishName);
-
canvas.commonVideoViewContent.closeScreenSharing(value);
- } else {
- //free the VideoContainer
-
//canvas._videocontainer.closeStreamClient(value.publicSID);
-
canvas.commonVideoViewContent.closeStreamClient(value.publicSID);
-
canvas.setAttribute('numberofpartners',canvas.numberofpartners-1);
- }
- //TODO:check first current tab
- </handler>
- </netRemoteCallHib>
+ <method name="closeStream" args="value">
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("**** closeStream: ",value);
+ if (value == null) {
+ return;
+ }
+ if (value.screenClient) {
+ if ($debug) Debug.write(" ondata closeStream:
",value.streamPublishName);
+
canvas.commonVideoViewContent.closeScreenSharing(value);
+ } else {
+ //free the VideoContainer
+
//canvas._videocontainer.closeStreamClient(value.publicSID);
+
canvas.commonVideoViewContent.closeStreamClient(value.publicSID);
+
canvas.setAttribute('numberofpartners',canvas.numberofpartners-1);
+ }
+ //TODO:check first current tab
+ </method>
<!---
Event is invoked if a red5 stream sharing is closed
