[jira] [Created] (OPENMEETINGS-1727) More OAuth providers should be added

2017-10-22 Thread Maxim Solodovnik (JIRA) 
Maxim Solodovnik created OPENMEETINGS-1727:
--

 Summary: More OAuth providers should be added
 Key: OPENMEETINGS-1727
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1727
 Project: Openmeetings
  Issue Type: Bug
  Components: OAuth
Affects Versions: 4.0.1
Reporter: Maxim Solodovnik
Assignee: Maxim Solodovnik
 Fix For: 4.0.1


More OAuth providers should be added

* VK
* Twitter

All need to be set on demo



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1725) Camera and mic settings dialog is not work properly in the interview room

2017-10-22 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1725?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16214573#comment-16214573
 ] 

ASF subversion and git services commented on OPENMEETINGS-1725:
---

Commit 536e91054109682b2433f5c61e57b0f995ef4803 in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=536e910 ]

[OPENMEETINGS-1725] settings dialog seems to be fixed


> Camera and mic settings dialog is not work properly in the interview room
> -
>
> Key: OPENMEETINGS-1725
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1725
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/Room
>Affects Versions: 4.0.0
>Reporter: Vasiliy Degtyarev
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
> Attachments: InterviewRoom.png
>
>
> Go to interview room and select pod with camera and mic then click on Camera 
> and mic settings icon and change camera resolution and click on Save button. 
> Camera resolution is changed, but dialog window is not closed.
> It seems that camera resolution should not be changed in the interview room.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1725] settings dialog seems to be fixed

2017-10-22 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x 6229d29a4 -> 536e91054


[OPENMEETINGS-1725] settings dialog seems to be fixed


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/536e9105
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/536e9105
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/536e9105

Branch: refs/heads/4.0.x
Commit: 536e91054109682b2433f5c61e57b0f995ef4803
Parents: 6229d29
Author: Maxim Solodovnik 
Authored: Fri Oct 20 21:49:53 2017 +0700
Committer: Maxim Solodovnik 
Committed: Mon Oct 23 10:13:11 2017 +0700

--
 .../src/main/java/org/apache/openmeetings/web/room/room.js | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/536e9105/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index 426ef69..5901316 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -115,7 +115,9 @@ var Video = (function() {
function _getName() {
return c.user.firstName + ' ' + c.user.lastName;
}
-   function _resizeDlg(_w, _h) {
+   function _resizeDlg(_ww, _hh) {
+   const interview = Room.getOptions().interview;
+   const _w = interview ? 320 : _ww, _h = interview ? 260 : _hh;
const h = _h + t.height() + 2 + (f.is(":visible") ? f.height() 
: 0);
v.dialog("option", "width", _w).dialog("option", "height", h);
_resize(_w, _h);
@@ -337,7 +339,7 @@ var Video = (function() {
function _refresh(_opts) {
if (swf[0].refresh !== undefined) {
const opts = _opts || {};
-   if (!isNaN(opts.width)) {
+   if (!Room.getOptions().interview && !isNaN(opts.width)) 
{
_resizeDlg(opts.width, opts.height);
}
swf[0].refresh(opts);

[jira] [Commented] (OPENMEETINGS-980) Library versions should be updated

2017-10-22 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-980?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16214558#comment-16214558
 ] 

ASF subversion and git services commented on OPENMEETINGS-980:
--

Commit 6229d29a4071f6b2609e01beef3ce39b32dc6663 in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=6229d29 ]

[OPENMEETINGS-980] derby version is updated


> Library versions should be updated
> --
>
> Key: OPENMEETINGS-980
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-980
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Library versions should be keep up to date (continuous task)



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-980) Library versions should be updated

2017-10-22 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-980?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16214559#comment-16214559
 ] 

ASF subversion and git services commented on OPENMEETINGS-980:
--

Commit 66c2c5943c1fcbdc1a8dcecd8eaed5b6526913fd in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=66c2c59 ]

[OPENMEETINGS-980] derby version is updated


> Library versions should be updated
> --
>
> Key: OPENMEETINGS-980
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-980
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Library versions should be keep up to date (continuous task)



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-980] derby version is updated

2017-10-22 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 37bc63784 -> 66c2c5943


[OPENMEETINGS-980] derby version is updated


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/66c2c594
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/66c2c594
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/66c2c594

Branch: refs/heads/master
Commit: 66c2c5943c1fcbdc1a8dcecd8eaed5b6526913fd
Parents: 37bc637
Author: Maxim Solodovnik 
Authored: Mon Oct 23 09:46:23 2017 +0700
Committer: Maxim Solodovnik 
Committed: Mon Oct 23 09:46:46 2017 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/66c2c594/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c97649e..f314653 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
1.3.8
${project.basedir}
false
-   10.13.1.1
+   10.14.1.0
test


https://builds.apache.org/analysis

openmeetings git commit: [OPENMEETINGS-980] derby version is updated

2017-10-22 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x 58c55fd33 -> 6229d29a4


[OPENMEETINGS-980] derby version is updated


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6229d29a
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6229d29a
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6229d29a

Branch: refs/heads/4.0.x
Commit: 6229d29a4071f6b2609e01beef3ce39b32dc6663
Parents: 58c55fd
Author: Maxim Solodovnik 
Authored: Mon Oct 23 09:46:23 2017 +0700
Committer: Maxim Solodovnik 
Committed: Mon Oct 23 09:46:23 2017 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6229d29a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d6f8713..4f67c02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
1.3.8
${project.basedir}
false
-   10.13.1.1
+   10.14.1.0
test


https://builds.apache.org/analysis

[jira] [Commented] (OPENMEETINGS-1724) Stop recording button is not work in the interview room

2017-10-22 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1724?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16214365#comment-16214365
 ] 

ASF subversion and git services commented on OPENMEETINGS-1724:
---

Commit 58c55fd333ac3ca2aa53911e6152b69805b86d31 in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=58c55fd ]

[OPENMEETINGS-1724] code clean-up


> Stop recording button is not work in the interview room
> ---
>
> Key: OPENMEETINGS-1724
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1724
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/Recordings, HTML5/Room
>Affects Versions: 4.0.0
>Reporter: Vasiliy Degtyarev
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Enter to the interview room and start recording. Click on Stop recording. 
> Stop recording button is not disabled and Start recording button is not 
> enabled, but recording is created.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1724] code clean-up

2017-10-22 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x a6993e1bd -> 58c55fd33


[OPENMEETINGS-1724] code clean-up


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/58c55fd3
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/58c55fd3
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/58c55fd3

Branch: refs/heads/4.0.x
Commit: 58c55fd333ac3ca2aa53911e6152b69805b86d31
Parents: a6993e1
Author: Maxim Solodovnik 
Authored: Sun Oct 22 22:56:43 2017 +0700
Committer: Maxim Solodovnik 
Committed: Sun Oct 22 22:57:06 2017 +0700

--
 .../org/apache/openmeetings/core/converter/ImageConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/58c55fd3/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
--
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
index b87b963..9bf1cbd 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
@@ -125,7 +125,7 @@ public class ImageConverter extends BaseConverter {
return cfgDao.getString(CONFIG_DOCUMENT_QUALITY, "90");
}
 
-   private ProcessResult initSize(BaseFileItem f, File img, String mime) {
+   private static ProcessResult initSize(BaseFileItem f, File img, String 
mime) {
ProcessResult res = new ProcessResult();
res.setProcess("get image dimensions :: " + f.getId());
final Parser parser = new ImageParser();

[jira] [Commented] (OPENMEETINGS-1724) Stop recording button is not work in the interview room

2017-10-22 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1724?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16214364#comment-16214364
 ] 

ASF subversion and git services commented on OPENMEETINGS-1724:
---

Commit 37bc6378497a3fdbcc257168e9106c82669b028e in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=37bc637 ]

[OPENMEETINGS-1724] code clean-up


> Stop recording button is not work in the interview room
> ---
>
> Key: OPENMEETINGS-1724
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1724
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/Recordings, HTML5/Room
>Affects Versions: 4.0.0
>Reporter: Vasiliy Degtyarev
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Enter to the interview room and start recording. Click on Stop recording. 
> Stop recording button is not disabled and Start recording button is not 
> enabled, but recording is created.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1724] code clean-up

2017-10-22 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 715c25127 -> 37bc63784


[OPENMEETINGS-1724] code clean-up


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/37bc6378
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/37bc6378
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/37bc6378

Branch: refs/heads/master
Commit: 37bc6378497a3fdbcc257168e9106c82669b028e
Parents: 715c251
Author: Maxim Solodovnik 
Authored: Sun Oct 22 22:56:43 2017 +0700
Committer: Maxim Solodovnik 
Committed: Sun Oct 22 22:56:43 2017 +0700

--
 .../org/apache/openmeetings/core/converter/ImageConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37bc6378/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
--
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
index b87b963..9bf1cbd 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
@@ -125,7 +125,7 @@ public class ImageConverter extends BaseConverter {
return cfgDao.getString(CONFIG_DOCUMENT_QUALITY, "90");
}
 
-   private ProcessResult initSize(BaseFileItem f, File img, String mime) {
+   private static ProcessResult initSize(BaseFileItem f, File img, String 
mime) {
ProcessResult res = new ProcessResult();
res.setProcess("get image dimensions :: " + f.getId());
final Parser parser = new ImageParser();

[jira] [Commented] (OPENMEETINGS-1724) Stop recording button is not work in the interview room

2017-10-22 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1724?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16214361#comment-16214361
 ] 

ASF subversion and git services commented on OPENMEETINGS-1724:
---

Commit a6993e1bd4f70238e76603618a775ccaa29b3a7e in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=a6993e1 ]

[OPENMEETINGS-1724] screen sharing app is updated to unpublish stream


> Stop recording button is not work in the interview room
> ---
>
> Key: OPENMEETINGS-1724
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1724
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/Recordings, HTML5/Room
>Affects Versions: 4.0.0
>Reporter: Vasiliy Degtyarev
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Enter to the interview room and start recording. Click on Stop recording. 
> Stop recording button is not disabled and Start recording button is not 
> enabled, but recording is created.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1724) Stop recording button is not work in the interview room

2017-10-22 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1724?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16214360#comment-16214360
 ] 

ASF subversion and git services commented on OPENMEETINGS-1724:
---

Commit 715c251272c6a2dda9de6d323b741ccb39074d25 in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=715c251 ]

[OPENMEETINGS-1724] screen sharing app is updated to unpublish stream


> Stop recording button is not work in the interview room
> ---
>
> Key: OPENMEETINGS-1724
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1724
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/Recordings, HTML5/Room
>Affects Versions: 4.0.0
>Reporter: Vasiliy Degtyarev
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Enter to the interview room and start recording. Click on Stop recording. 
> Stop recording button is not disabled and Start recording button is not 
> enabled, but recording is created.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1724] screen sharing app is updated to unpublish stream

2017-10-22 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x fcebc3691 -> a6993e1bd


[OPENMEETINGS-1724] screen sharing app is updated to unpublish stream


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a6993e1b
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a6993e1b
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a6993e1b

Branch: refs/heads/4.0.x
Commit: a6993e1bd4f70238e76603618a775ccaa29b3a7e
Parents: fcebc36
Author: Maxim Solodovnik 
Authored: Sun Oct 22 22:54:34 2017 +0700
Committer: Maxim Solodovnik 
Committed: Sun Oct 22 22:55:06 2017 +0700

--
 .../openmeetings/screenshare/CaptureScreen.java |  4 
 .../org/apache/openmeetings/screenshare/Core.java   | 16 ++--
 .../openmeetings/screenshare/IScreenShare.java  |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a6993e1b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
--
diff --git 
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
 
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
index a8cd2c7..0a56289 100644
--- 
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
+++ 
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
@@ -207,6 +207,10 @@ public class CaptureScreen extends Thread {
core.sendCursorStatus();
}
 
+   public boolean isStarted() throws SchedulerException {
+   return active && _scheduler != null && _scheduler.isStarted() 
&& !_scheduler.isShutdown();
+   }
+
public void setSendCursor(boolean sendCursor) {
try {
Scheduler s = getScheduler();

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a6993e1b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
--
diff --git 
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
 
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
index 88c6ba8..3358092 100644
--- 
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
+++ 
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
@@ -535,18 +535,22 @@ public class Core implements IPendingServiceCallback, 
INetStreamEventHandler {
}
} else if ("createStream".equals(method)) {
if (startRecording || startSharing) {
+   CaptureScreen capture = getCapture();
if (o != null && o instanceof Number) {
-   
getCapture().setStreamId((Number)o);
+   if (capture.getStreamId() != 
null) {
+   
instance.unpublish(capture.getStreamId());
+   }
+   capture.setStreamId((Number)o);
}
final String broadcastId = 
UUID.randomUUID().toString();
-   log.debug("createPublishStream result 
stream id: {}; name: {}", getCapture().getStreamId(), broadcastId);
-   
instance.publish(getCapture().getStreamId(), broadcastId, "live", this);
+   log.debug("createPublishStream result 
stream id: {}; name: {}", capture.getStreamId(), broadcastId);
+   instance.publish(capture.getStreamId(), 
broadcastId, "live", this);
 
log.debug("setup capture thread 
spinnerWidth = {}; spinnerHeight = {};", dim.getSpinnerWidth(), 
dim.getSpinnerHeight());
 
-   if (!getCapture().isAlive()) {
-   
getCapture().setSendCursor(startSharing);
-   getCapture().start();
+   if (!capture.isStarted()) {
+   
capture.setSendCursor(startSharing);
+   capture.start();
}

openmeetings git commit: [OPENMEETINGS-1724] screen sharing app is updated to unpublish stream

2017-10-22 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master be71e177a -> 715c25127


[OPENMEETINGS-1724] screen sharing app is updated to unpublish stream


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/715c2512
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/715c2512
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/715c2512

Branch: refs/heads/master
Commit: 715c251272c6a2dda9de6d323b741ccb39074d25
Parents: be71e17
Author: Maxim Solodovnik 
Authored: Sun Oct 22 22:54:34 2017 +0700
Committer: Maxim Solodovnik 
Committed: Sun Oct 22 22:54:34 2017 +0700

--
 .../openmeetings/screenshare/CaptureScreen.java |  4 
 .../org/apache/openmeetings/screenshare/Core.java   | 16 ++--
 .../openmeetings/screenshare/IScreenShare.java  |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/715c2512/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
--
diff --git 
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
 
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
index a8cd2c7..0a56289 100644
--- 
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
+++ 
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
@@ -207,6 +207,10 @@ public class CaptureScreen extends Thread {
core.sendCursorStatus();
}
 
+   public boolean isStarted() throws SchedulerException {
+   return active && _scheduler != null && _scheduler.isStarted() 
&& !_scheduler.isShutdown();
+   }
+
public void setSendCursor(boolean sendCursor) {
try {
Scheduler s = getScheduler();

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/715c2512/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
--
diff --git 
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
 
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
index 88c6ba8..3358092 100644
--- 
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
+++ 
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
@@ -535,18 +535,22 @@ public class Core implements IPendingServiceCallback, 
INetStreamEventHandler {
}
} else if ("createStream".equals(method)) {
if (startRecording || startSharing) {
+   CaptureScreen capture = getCapture();
if (o != null && o instanceof Number) {
-   
getCapture().setStreamId((Number)o);
+   if (capture.getStreamId() != 
null) {
+   
instance.unpublish(capture.getStreamId());
+   }
+   capture.setStreamId((Number)o);
}
final String broadcastId = 
UUID.randomUUID().toString();
-   log.debug("createPublishStream result 
stream id: {}; name: {}", getCapture().getStreamId(), broadcastId);
-   
instance.publish(getCapture().getStreamId(), broadcastId, "live", this);
+   log.debug("createPublishStream result 
stream id: {}; name: {}", capture.getStreamId(), broadcastId);
+   instance.publish(capture.getStreamId(), 
broadcastId, "live", this);
 
log.debug("setup capture thread 
spinnerWidth = {}; spinnerHeight = {};", dim.getSpinnerWidth(), 
dim.getSpinnerHeight());
 
-   if (!getCapture().isAlive()) {
-   
getCapture().setSendCursor(startSharing);
-   getCapture().start();
+   if (!capture.isStarted()) {
+   
capture.setSendCursor(startSharing);
+   capture.start();
}