openmeetings git commit: [OPENMEETINGS-1696] more work on AV in conf room

2017-09-12 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x d6f0f022b -> 4943f46b0


[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/4943f46b
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4943f46b
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4943f46b

Branch: refs/heads/3.3.x
Commit: 4943f46b07e7f0f750b09dc3be5c3afa554da9e4
Parents: d6f0f02
Author: Maxim Solodovnik 
Authored: Wed Sep 13 10:01:15 2017 +0700
Committer: Maxim Solodovnik 
Committed: Wed Sep 13 10:01:15 2017 +0700

--
 .../src/main/swf/base/hibernate/hibRtmpConnection.lzx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4943f46b/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
--
diff --git 
a/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx 
b/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
index d0ec07a..eac7038 100644
--- a/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
+++ b/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
@@ -504,7 +504,7 @@

//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write(" closeStream: ", value);
-   if (value == null) {
+   if (value == null || value.isBroadcasting) {
return;
}
if (value.screenClient) {

openmeetings git commit: [OPENMEETINGS-1696] more work on AV in conf room

2017-09-11 Thread solomax 
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 
Authored: Tue Sep 12 11:03:27 2017 +0700
Committer: Maxim Solodovnik 
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 @@

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;