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 2017/10/20 08:40:19 UTC
openmeetings git commit: [OPENMEETINGS-1724] recordings in interview
are fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 20ceddfe5 -> 26c75a411
[OPENMEETINGS-1724] recordings in interview are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/26c75a41
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/26c75a41
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/26c75a41
Branch: refs/heads/master
Commit: 26c75a4113736536c8039ffd9f9b4dc36803da95
Parents: 20ceddf
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 20 15:40:11 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 20 15:40:11 2017 +0700
----------------------------------------------------------------------
.../apache/openmeetings/core/service/RecordingService.java | 7 +++++--
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 3 +--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c75a41/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
index 18bfa4e..6a1ffbd 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
@@ -148,7 +148,7 @@ public class RecordingService {
startStreamRecord(conn, recordingId, isInterview);
}
}
- // Send every user a notification that the recording did start
+ // Send notification to all users that the recording has been started
WebSocketHelper.sendRoom(new TextRoomMessage(roomId, ownerId, RoomMessage.Type.recordingStarted
, new JSONObject().put("uid", client.getUid()).put("sid", client.getSid()).toString()));
} catch (Exception err) {
@@ -172,15 +172,18 @@ public class RecordingService {
break;
}
}
+ IClient stopClient;
if (recClient == null) {
log.warn("Unable to find Recording client");
+ stopClient = client;
} else {
- WebSocketHelper.sendRoom(new TextRoomMessage(recClient.getRoomId(), recClient.getUserId(), RoomMessage.Type.recordingStoped, recClient.getSid()));
+ stopClient = recClient;
// Store to database
recClient.setRecordingId(null);
recClient.setRecordingStarted(false);
sessionManager.update(recClient);
}
+ WebSocketHelper.sendRoom(new TextRoomMessage(stopClient.getRoomId(), stopClient.getUserId(), RoomMessage.Type.recordingStoped, stopClient.getSid()));
// get all stream and stop recording them
for (IConnection conn : scope.getClientConnections()) {
if (conn != null && conn instanceof IServiceCapableConnection) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c75a41/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 139d229..77d0360 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -426,7 +426,6 @@ public class RoomPanel extends BasePanel {
case recordingStarted:
{
JSONObject obj = new JSONObject(((TextRoomMessage)m).getText());
- String uid = obj.getString("uid");
String sid = obj.getString("sid");
Client c = getClientBySid(sid);
if (c == null) {
@@ -434,7 +433,7 @@ public class RoomPanel extends BasePanel {
return;
}
recordingUser = sid;
- update(c.addStream(uid).set(Client.Activity.record));
+ update(c.set(Client.Activity.record));
menu.update(handler);
updateInterviewRecordingButtons(handler);
}