You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/10/21 10:44:49 UTC
svn commit: r1633313 - in /openmeetings/branches/3.0.x/WebContent:
src/base/hibernate/hibRtmpConnection.lzx src/base/mainMethods.lzx
src/modules/conference/popups/meetingTimer.lzx
swf10/commonVideoViewContentSWF10.lzx
Author: solomax
Date: Tue Oct 21 08:44:49 2014
New Revision: 1633313
URL: http://svn.apache.org/r1633313
Log:
[OPENMEETINGS-1110] video streams are disconnected on room exit
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/meetingTimer.lzx
openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx
Modified: openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1633313&r1=1633312&r2=1633313&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx Tue Oct 21 08:44:49 2014
@@ -225,7 +225,7 @@
lz.ModeManager.releaseAll();
}
if ($debug) Debug.write("Error dialog is being closed, calling QUIT");
- canvas.doActionmenu('quit');
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "immediateExitRoom", [true,null]);
}
});
this.showFullMessage = false;
Modified: openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx?rev=1633313&r1=1633312&r2=1633313&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx Tue Oct 21 08:44:49 2014
@@ -502,8 +502,14 @@
} else if (stringSub=='showSipDialer') {
new lz.sipDialer(canvas.main_content._content.inner);
} else if (stringSub=='quit') {
- canvas.thishib.disconnect();
- canvas.sendViaLocalConnection(canvas.vid_lc_name, "immediateExitRoom", [true,null]);
+ canvas.videoComp_lc.exitRoom = null;
+ canvas.thishib.src = null;
+ canvas.thishib.reconnectionAction = false;
+ canvas.thishib.reconnectAfterRoomleft = false;
+ canvas.thishib.counterror = 100;
+ canvas.thishib.disconnect();
+ canvas.thishib._nc.close();
+ flash.external.ExternalInterface.call("roomExit");
} else if( stringSub == "browser_open" ){
var browserPanelWidth = canvas.browserPanelWidth;
var browserPanelHeight = canvas.browserPanelHeight;
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/meetingTimer.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/meetingTimer.lzx?rev=1633313&r1=1633312&r2=1633313&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/meetingTimer.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/meetingTimer.lzx Tue Oct 21 08:44:49 2014
@@ -50,7 +50,7 @@
lz.Timer.addTimer( new LzDelegate( this, "fadeText" ), 1000 );
} else {
if ($debug) Debug.write("DEMO IS OVER ");
- canvas.doActionmenu('quit');
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "immediateExitRoom", [true,null]);
}
]]>
</method>
Modified: openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1633313&r1=1633312&r2=1633313&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx Tue Oct 21 08:44:49 2014
@@ -510,10 +510,17 @@
<method name="immediateExitRoom" args="bool,ctx">
<![CDATA[
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'exitRoom', bool);
+ if($debug) Debug.write("0");
if (canvas.wicketsid != null && bool) {
+ if($debug) Debug.write("1");
clearAll();
- flash.external.ExternalInterface.call("roomExit");
+ if($debug) Debug.write("2");
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'exitRoom', bool);
+ if($debug) Debug.write("3");
+ if($debug) Debug.write("Do disconnect 10:: ", canvas.thishib);
+ canvas.thishib.src = null;
+ canvas.thishib.disconnect();
+ canvas.thishib._nc.close();
}
]]>
</method>