This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 4891dd5 [OPENMEETINGS-2049] play-on-enter seems to be fixed
4891dd5 is described below
commit 4891dd540ef6b433662bacb8eac4f0866bc74763
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Mar 29 12:14:55 2019 +0700
[OPENMEETINGS-2049] play-on-enter seems to be fixed
---
.../java/org/apache/openmeetings/core/remote/KStream.java | 9 +++++----
.../org/apache/openmeetings/core/util/WebSocketHelper.java | 13 +++++++------
.../org/apache/openmeetings/web/room/raw-video-manager.js | 11 +++++++++++
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 393e7b2..fa5b917 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -200,10 +200,11 @@ public class KStream extends AbstractStream {
endpoint.addTag("outUid", this.uid);
endpoint.addTag("uid", uid);
- endpoint.addIceCandidateFoundListener(evt ->
processor.getHandler().sendClient(sid, newKurentoMsg()
- .put("id", "iceCandidate")
- .put("uid", KStream.this.uid)
- .put(PARAM_CANDIDATE,
convert(JsonUtils.toJsonObject(evt.getCandidate()))))
+ endpoint.addIceCandidateFoundListener(evt ->
processor.getHandler().sendClient(sid
+ , newKurentoMsg()
+ .put("id", "iceCandidate")
+ .put("uid", KStream.this.uid)
+ .put(PARAM_CANDIDATE,
convert(JsonUtils.toJsonObject(evt.getCandidate()))))
);
return endpoint;
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
index 3689520..2ff774b 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
@@ -55,9 +55,9 @@ import com.github.openjson.JSONObject;
public class WebSocketHelper {
private static final Logger log =
LoggerFactory.getLogger(WebSocketHelper.class);
- public static void sendClient(final IWsClient _c, byte[] b) {
- if (_c != null) {
- sendClient(_c, c -> {
+ public static void sendClient(final IWsClient inC, byte[] b) {
+ if (inC != null) {
+ sendClient(inC, c -> {
try {
c.sendMessage(b, 0, b.length);
} catch (IOException e) {
@@ -67,9 +67,10 @@ public class WebSocketHelper {
}
}
- public static void sendClient(final IWsClient _c, JSONObject msg) {
- if (_c != null) {
- sendClient(_c, c -> {
+ public static void sendClient(final IWsClient inC, JSONObject msg) {
+ log.trace("Sending WebSocket message to Client: {} -> {}", inC,
msg);
+ if (inC != null) {
+ sendClient(inC, c -> {
try {
c.sendMessage(msg.toString());
} catch (IOException e) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
index e61fc54..5255291 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
@@ -11,6 +11,17 @@ var VideoManager = (function() {
if (error) {
return OmUtil.error(error);
}
+ const vidEls = w.find('audio, video')
+ , vidEl = vidEls.length === 1 ? vidEls[0] :
null;
+ if (vidEl && vidEl.paused) {
+ vidEl.play().catch(function(err) {
+ if ('NotAllowedError' === err.name) {
+
VideoUtil.askPermission(function() {
+ vidEl.play();
+ });
+ }
+ });
+ }
});
}
function _onBroadcast(msg) {
