Repository: openmeetings Updated Branches: refs/heads/3.3.x 42418d7cf -> 33d84f19f
[OPENMEETINGS-1696] more work on AV in conf room Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/33d84f19 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/33d84f19 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/33d84f19 Branch: refs/heads/3.3.x Commit: 33d84f19fd5a9d4ff9cf56e29e10efe3cb444e30 Parents: 42418d7 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Tue Sep 12 11:03:27 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Tue Sep 12 11:03:27 2017 +0700 ---------------------------------------------------------------------- .../main/swf/base/remote/baseVideoStream.lzx | 44 ++++++++------------ 1 file changed, 17 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/33d84f19/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx b/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx index 7ca59ab..7733d00 100644 --- a/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx +++ b/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx @@ -270,37 +270,27 @@ <method name="_stop"> if ($debug) Debug.write("STOP: ",this.mode,this._ns); //Stop NetStream - if (this._ns == null) return; - this.camera = null; - this.micro = null; - this._ns.attachCamera(null); - this._ns.attachAudio(null); - if (this.mode == "play") { - this.soundRefMC = null; - this.soundRef = null; - this._ns.pause(); - this._ns.close(); - //remove NetStream from Video-Object - this.clear(); - this._ns = null; - } else if (this.mode == "broadcast") { - this._ns.publish(false); - //remove NetStream from Video-Object - this.clear(); - this._ns.close(); - this._ns = null; - } else if (this.mode == "record") { - this._ns.publish(false); - //remove NetStream from Video-Object + if (this._ns != null) { + this.camera = null; + this.micro = null; + switch (this.mode) { + case "play": + this.soundRefMC = null; + this.soundRef = null; + this._ns.pause(); + break; + case "broadcast": + case "record": + this._ns.publish(null); + default: + break; + } this.clear(); - this._ns.close(); - this._ns = null; + this._ns.dispose(); } else { this.clear(); - this._ns.close(); - this._ns = null; - if ($debug) Debug.warn("Not known Mode: ",this.mode,this); } + this._ns = null; </method> <method name="restart">
